From 3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 2 Nov 2015 09:54:54 -0800 Subject: 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 . --- fpdfsdk/include/formfiller/FFL_ComboBox.h | 3 ++- fpdfsdk/include/formfiller/FFL_IFormFiller.h | 13 ++++++------- fpdfsdk/include/formfiller/FFL_TextField.h | 3 ++- fpdfsdk/include/fsdk_baseannot.h | 11 ++++------- fpdfsdk/include/fsdk_baseform.h | 19 +++++++------------ 5 files changed, 21 insertions(+), 28 deletions(-) (limited to 'fpdfsdk/include') 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; diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 706e96435e..58abfff49e 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -71,7 +71,6 @@ class CPDFSDK_Annot { CPDFSDK_Annot(CPDFSDK_PageView* pPageView); virtual ~CPDFSDK_Annot(){}; - public: virtual FX_BOOL IsXFAField() { return FALSE; } virtual FX_FLOAT GetMinWidth() const; @@ -79,8 +78,8 @@ class CPDFSDK_Annot { // define layout order to 5. virtual int GetLayoutOrder() const { return 5; } - virtual CPDF_Annot* GetPDFAnnot() { return NULL; } - virtual IXFA_Widget* GetXFAWidget() { return NULL; } + virtual CPDF_Annot* GetPDFAnnot() const { return nullptr; } + virtual IXFA_Widget* GetXFAWidget() const { return nullptr; } virtual CFX_ByteString GetType() const { return ""; } virtual CFX_ByteString GetSubType() const { return ""; } @@ -92,12 +91,11 @@ class CPDFSDK_Annot { CPDF_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) {} - public: CPDF_Page* GetPDFPage(); CPDFXFA_Page* GetPDFXFAPage(); void SetPage(CPDFSDK_PageView* pPageView) { m_pPageView = pPageView; } - CPDFSDK_PageView* GetPageView() { return m_pPageView; } + CPDFSDK_PageView* GetPageView() const { return m_pPageView; } // Tab Order int GetTabOrder(); @@ -128,7 +126,7 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { virtual void SetRect(const CPDF_Rect& rect); virtual CPDF_Rect GetRect() const; - virtual CPDF_Annot* GetPDFAnnot(); + virtual CPDF_Annot* GetPDFAnnot() const; virtual void Annot_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, @@ -205,7 +203,6 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { void ClearCachedAP(); - virtual void ResetAppearance(); void WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Rect& rcBBox, const CPDF_Matrix& matrix, diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index bcba4c831b..a6716c5748 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -193,9 +193,8 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { void DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, - const CPDF_RenderOptions* pOptions); + const CPDF_RenderOptions* pOptions) override; - public: FX_BOOL HitTest(FX_FLOAT pageX, FX_FLOAT pageY); CPDFSDK_InterForm* m_pInterForm; @@ -212,18 +211,14 @@ class CPDFSDK_XFAWidget : public CPDFSDK_Annot { CPDFSDK_XFAWidget(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm); - virtual ~CPDFSDK_XFAWidget() {} - - public: - virtual FX_BOOL IsXFAField(); - virtual IXFA_Widget* GetXFAWidget() { return m_hXFAWidget; } + ~CPDFSDK_XFAWidget() override {} - virtual CFX_ByteString GetType() const; - virtual CFX_ByteString GetSubType() const { return ""; } + FX_BOOL IsXFAField() override; + IXFA_Widget* GetXFAWidget() const override { return m_hXFAWidget; } + CFX_ByteString GetType() const override; + CFX_ByteString GetSubType() const override { return ""; } + CFX_FloatRect GetRect() const override; - virtual CFX_FloatRect GetRect(); - - public: CPDFSDK_InterForm* GetInterForm() { return m_pInterForm; } private: -- cgit v1.2.3