diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-11-04 14:04:13 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-11-04 14:04:13 -0500 |
| commit | bfe042a4c4f0bd739c568754ebee6d993e134ad3 (patch) | |
| tree | 75143d8210e96f252fa51b734d7e1f684c131561 /fpdfsdk/include | |
| parent | 5dbbc6bf047daceb952ae774346a2e74f002ec46 (diff) | |
| download | pdfium-bfe042a4c4f0bd739c568754ebee6d993e134ad3.tar.xz | |
Merge to XFA: Cleanup after syncing CPDFSDK_BAAnnot
This cleans up various things after syncing BAAnnot to master.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1418043007 .
(cherry picked from commit 110650e68e519e8cf14fe1119b77cf3309ed2d0b)
Review URL: https://codereview.chromium.org/1415933007 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseannot.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 58abfff49e..1cd29b1f87 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -68,8 +68,8 @@ class CPDFSDK_DateTime { class CPDFSDK_Annot { public: - CPDFSDK_Annot(CPDFSDK_PageView* pPageView); - virtual ~CPDFSDK_Annot(){}; + explicit CPDFSDK_Annot(CPDFSDK_PageView* pPageView); + virtual ~CPDFSDK_Annot() {} virtual FX_BOOL IsXFAField() { return FALSE; } @@ -106,7 +106,6 @@ class CPDFSDK_Annot { void SetSelected(FX_BOOL bSelected); protected: - CPDF_Annot* m_pAnnot; CPDFSDK_PageView* m_pPageView; FX_BOOL m_bSelected; int m_nTabOrder; @@ -115,9 +114,8 @@ class CPDFSDK_Annot { class CPDFSDK_BAAnnot : public CPDFSDK_Annot { public: CPDFSDK_BAAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView); - virtual ~CPDFSDK_BAAnnot(); + virtual ~CPDFSDK_BAAnnot() {} - public: virtual FX_BOOL IsXFAField(); virtual CFX_ByteString GetType() const; @@ -132,7 +130,6 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { CPDF_Matrix* pUser2Device, CPDF_RenderOptions* pOptions); - public: CPDF_Dictionary* GetAnnotDict() const; void SetContents(const CFX_WideString& sContents); @@ -190,7 +187,6 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { virtual CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT); - public: virtual FX_BOOL IsAppearanceValid(); virtual FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode); virtual void DrawAppearance(CFX_RenderDevice* pDevice, @@ -209,11 +205,11 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { const CFX_ByteString& sContents, const CFX_ByteString& sAPState = ""); - private: - FX_BOOL CreateFormFiller(); - protected: CPDF_Annot* m_pAnnot; + + private: + FX_BOOL CreateFormFiller(); }; #endif // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_ |