summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/fsdk_baseannot.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-11-04 13:49:51 -0500
committerDan Sinclair <dsinclair@chromium.org>2015-11-04 13:49:51 -0500
commit110650e68e519e8cf14fe1119b77cf3309ed2d0b (patch)
tree1f909326f5de37a2c64a47d404f5158d9c898513 /fpdfsdk/include/fsdk_baseannot.h
parentd3def7e54daef743ab0efbadda4531c64ffd1fc3 (diff)
downloadpdfium-110650e68e519e8cf14fe1119b77cf3309ed2d0b.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/include/fsdk_baseannot.h')
-rw-r--r--fpdfsdk/include/fsdk_baseannot.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index 063ffa078e..c152a4bc9e 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_FLOAT GetMinWidth() const;
virtual FX_FLOAT GetMinHeight() const;
@@ -102,7 +102,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;
@@ -111,9 +110,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 CFX_ByteString GetType() const;
virtual CFX_ByteString GetSubType() const;
@@ -126,7 +124,6 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
CPDF_Matrix* pUser2Device,
CPDF_RenderOptions* pOptions);
- public:
CPDF_Dictionary* GetAnnotDict() const;
void SetContents(const CFX_WideString& sContents);
@@ -184,7 +181,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,
@@ -203,11 +199,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_