diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-14 14:17:26 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-14 14:17:26 -0700 |
commit | dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba (patch) | |
tree | 58eef2a1e6763f71926524827da0f220f761f960 /fpdfsdk/src/pdfwindow | |
parent | 758ae14e113c07285126274577d7a5cab559fa65 (diff) | |
download | pdfium-dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba.tar.xz |
Next round of XFA changes to match master.
This contains a missed merge of the Document:delay fixes.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1398703009 .
Diffstat (limited to 'fpdfsdk/src/pdfwindow')
-rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 932f8c56d6..2a9afe7dc6 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp @@ -594,10 +594,7 @@ FX_BOOL CPWL_ComboBox::OnChar(FX_WORD nChar, FX_DWORD nFlag) { if (bExit) return FALSE; } - if (m_pList->OnCharWithExit(nChar, bExit, nFlag)) - return bExit; - - return FALSE; + return m_pList->OnCharWithExit(nChar, bExit, nFlag) ? bExit : FALSE; } void CPWL_ComboBox::OnNotify(CPWL_Wnd* pWnd, |