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/fsdk_baseform.h | |
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/fsdk_baseform.h')
-rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 19 |
1 files changed, 7 insertions, 12 deletions
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: |