diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-06-02 00:45:14 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-02 18:31:20 +0000 |
| commit | 4f34c64914be17966f2d91591921dec635582061 (patch) | |
| tree | 762d9af8dd0aaeb084a007e6133418e56f6a7605 /fpdfsdk/formfiller/cffl_combobox.cpp | |
| parent | dd29c258fbf7838ddd0ee99361beb4c2da8dce7f (diff) | |
| download | pdfium-4f34c64914be17966f2d91591921dec635582061.tar.xz | |
Clean up CFFL formfiller classes.
- Consolidate assertions for m_pFormFillEnv.
- Remove check for m_pFormFillEnv being NULL.
- Pass in a CPDFSDK_Widget* instead of an Annot* and then casting.
- Remove unused LoadPopupMenuString() method.
Change-Id: Ic22e75c9e41eb54002be812945a3ee80debeca8b
Reviewed-on: https://pdfium-review.googlesource.com/6232
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_combobox.cpp')
| -rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 4f9ffff5af..8e4efc453a 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -16,8 +16,8 @@ #include "third_party/base/ptr_util.h" CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp, - CPDFSDK_Annot* pAnnot) - : CFFL_FormFiller(pApp, pAnnot) { + CPDFSDK_Widget* pWidget) + : CFFL_FormFiller(pApp, pWidget) { m_State.nIndex = 0; m_State.nStart = 0; m_State.nEnd = 0; @@ -258,8 +258,6 @@ bool CFFL_ComboBox::IsFieldFull(CPDFSDK_PageView* pPageView) { #endif // PDF_ENABLE_XFA void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) { - ASSERT(m_pFormFillEnv); - if (pWnd->GetClassName() != PWL_CLASSNAME_EDIT) return; |