diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-02 09:54:54 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-02 09:54:54 -0800 |
| commit | 3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e (patch) | |
| tree | ab220ffcea223cacd136054603c63324a1d9d5f4 /fpdfsdk/include/formfiller | |
| parent | 1b700c3c452429dacde3c163a6edb2706f93d4a7 (diff) | |
| download | pdfium-3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e.tar.xz | |
Fix XFA compilation noise, part 1.
Mainly:
volatile/override/method shadowing.
unused variables.
intialization list init order.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1422113003 .
Diffstat (limited to 'fpdfsdk/include/formfiller')
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_ComboBox.h | 3 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_IFormFiller.h | 13 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_TextField.h | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index c943511c97..f1c8b2d99b 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -55,7 +55,8 @@ class CFFL_ComboBox : public CFFL_FormFiller, // IPWL_Edit_Notify: void OnAddUndo(CPWL_Edit* pEdit) override; - virtual FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView); + // CFFL_FormFiller: + FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override; private: CFX_WideString GetSelectExportText(); diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index 723aa2bcb4..79a8964626 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -79,13 +79,6 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); - virtual void OnPopupPreOpen(void* pPrivateData, - FX_BOOL& bExit, - FX_DWORD nFlag); - virtual void OnPopupPostOpen(void* pPrivateData, - FX_BOOL& bExit, - FX_DWORD nFlag); - CFFL_FormFiller* GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister); void RemoveFormFiller(CPDFSDK_Annot* pAnnot); @@ -158,6 +151,12 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag) override; + void OnPopupPreOpen(void* pPrivateData, + FX_BOOL& bExit, + FX_DWORD nFlag) override; + void OnPopupPostOpen(void* pPrivateData, + FX_BOOL& bExit, + FX_DWORD nFlag) override; void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); void SetFocusAnnotTab(CPDFSDK_Annot* pWidget, diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h index e8013cdba1..49a0f24e16 100644 --- a/fpdfsdk/include/formfiller/FFL_TextField.h +++ b/fpdfsdk/include/formfiller/FFL_TextField.h @@ -56,7 +56,8 @@ class CFFL_TextField : public CFFL_FormFiller, // IPWL_Edit_Notify: void OnAddUndo(CPWL_Edit* pEdit) override; - virtual FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView); + // CFFL_FormFiller: + FX_BOOL IsFieldFull(CPDFSDK_PageView* pPageView) override; private: CBA_FontMap* m_pFontMap; |