From 25d2ad482399ec20fdd0542d7c286ed06842f053 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 23 Mar 2017 15:19:44 -0400 Subject: Tighten up XFA Visibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl changes the protected sections to be private where possible in XFA. Change-Id: Ibeb6ad00389686b666b1c3c5e136b9eefe35ec9e Reviewed-on: https://pdfium-review.googlesource.com/3164 Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- xfa/fxfa/app/cxfa_linkuserdata.h | 2 +- xfa/fxfa/app/cxfa_textparsecontext.h | 2 +- xfa/fxfa/app/cxfa_textuserdata.h | 2 +- xfa/fxfa/app/xfa_ffcheckbutton.h | 2 +- xfa/fxfa/app/xfa_ffchoicelist.h | 4 ++-- xfa/fxfa/app/xfa_ffimageedit.h | 2 +- xfa/fxfa/app/xfa_ffpushbutton.h | 2 +- xfa/fxfa/app/xfa_fftextedit.h | 15 +++++++-------- xfa/fxfa/app/xfa_ffwidgetacc.h | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) (limited to 'xfa/fxfa/app') diff --git a/xfa/fxfa/app/cxfa_linkuserdata.h b/xfa/fxfa/app/cxfa_linkuserdata.h index 5f4675962d..a3ccd92712 100644 --- a/xfa/fxfa/app/cxfa_linkuserdata.h +++ b/xfa/fxfa/app/cxfa_linkuserdata.h @@ -19,7 +19,7 @@ class CXFA_LinkUserData : public CFX_Retainable { const wchar_t* GetLinkURL() const { return m_wsURLContent.c_str(); } - protected: + private: explicit CXFA_LinkUserData(wchar_t* pszText); ~CXFA_LinkUserData() override; diff --git a/xfa/fxfa/app/cxfa_textparsecontext.h b/xfa/fxfa/app/cxfa_textparsecontext.h index 5ea68e9473..514d5d7478 100644 --- a/xfa/fxfa/app/cxfa_textparsecontext.h +++ b/xfa/fxfa/app/cxfa_textparsecontext.h @@ -31,7 +31,7 @@ class CXFA_TextParseContext { CFX_RetainPtr m_pParentStyle; - protected: + private: std::vector decls_; FDE_CSSDisplay m_eDisplay; }; diff --git a/xfa/fxfa/app/cxfa_textuserdata.h b/xfa/fxfa/app/cxfa_textuserdata.h index b0eff73f2e..18a20cdc2a 100644 --- a/xfa/fxfa/app/cxfa_textuserdata.h +++ b/xfa/fxfa/app/cxfa_textuserdata.h @@ -21,7 +21,7 @@ class CXFA_TextUserData : public CFX_Retainable { CFX_RetainPtr m_pStyle; CFX_RetainPtr m_pLinkData; - protected: + private: explicit CXFA_TextUserData( const CFX_RetainPtr& pStyle); CXFA_TextUserData(const CFX_RetainPtr& pStyle, diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h index ea8ff923a7..75f884144d 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.h +++ b/xfa/fxfa/app/xfa_ffcheckbutton.h @@ -32,7 +32,7 @@ class CXFA_FFCheckButton : public CXFA_FFField { void SetFWLCheckState(XFA_CHECKSTATE eCheckState); - protected: + private: bool CommitData() override; bool IsDataChanged() override; diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 231381444b..b25d1862d4 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -29,7 +29,7 @@ class CXFA_FFListBox : public CXFA_FFField { void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1); void DeleteItem(int32_t nIndex); - protected: + private: bool CommitData() override; bool UpdateFWLData() override; bool IsDataChanged() override; @@ -82,7 +82,7 @@ class CXFA_FFComboBox : public CXFA_FFField { void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1); void DeleteItem(int32_t nIndex); - protected: + private: // CXFA_FFField bool PtInActiveRect(const CFX_PointF& point) override; bool CommitData() override; diff --git a/xfa/fxfa/app/xfa_ffimageedit.h b/xfa/fxfa/app/xfa_ffimageedit.h index 73032b9815..ee91a772e0 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.h +++ b/xfa/fxfa/app/xfa_ffimageedit.h @@ -26,7 +26,7 @@ class CXFA_FFImageEdit : public CXFA_FFField { void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; - protected: + private: void SetFWLRect() override; bool UpdateFWLData() override; bool CommitData() override; diff --git a/xfa/fxfa/app/xfa_ffpushbutton.h b/xfa/fxfa/app/xfa_ffpushbutton.h index 7e6e9e57d5..d2f5746fe9 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.h +++ b/xfa/fxfa/app/xfa_ffpushbutton.h @@ -36,7 +36,7 @@ class CXFA_FFPushButton : public CXFA_FFField { void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; - protected: + private: void LoadHighlightCaption(); void LayoutHighlightCaption(); void RenderHighlightCaption(CFX_Graphics* pGS, CFX_Matrix* pMatrix = nullptr); diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h index 1e0562a75b..9b9324f9d2 100644 --- a/xfa/fxfa/app/xfa_fftextedit.h +++ b/xfa/fxfa/app/xfa_fftextedit.h @@ -36,14 +36,15 @@ class CXFA_FFTextEdit : public CXFA_FFField { bool CheckWord(const CFX_ByteStringC& sWord); protected: + uint32_t GetAlignment(); + + IFWL_WidgetDelegate* m_pOldDelegate; + + private: bool CommitData() override; bool UpdateFWLData() override; bool IsDataChanged() override; - - uint32_t GetAlignment(); void ValidateNumberField(const CFX_WideString& wsText); - - IFWL_WidgetDelegate* m_pOldDelegate; }; class CXFA_FFNumericEdit : public CXFA_FFTextEdit { @@ -56,7 +57,7 @@ class CXFA_FFNumericEdit : public CXFA_FFTextEdit { void UpdateWidgetProperty() override; void OnProcessEvent(CFWL_Event* pEvent) override; - public: + private: bool OnValidate(CFWL_Widget* pWidget, CFX_WideString& wsText); }; @@ -68,8 +69,6 @@ class CXFA_FFPasswordEdit : public CXFA_FFTextEdit { // CXFA_FFTextEdit bool LoadWidget() override; void UpdateWidgetProperty() override; - - protected: }; enum XFA_DATETIMETYPE { @@ -94,7 +93,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { int32_t iMonth, int32_t iDay); - protected: + private: bool PtInActiveRect(const CFX_PointF& point) override; bool CommitData() override; bool UpdateFWLData() override; diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.h b/xfa/fxfa/app/xfa_ffwidgetacc.h index 8cb66e2dc5..c4988fde66 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.h +++ b/xfa/fxfa/app/xfa_ffwidgetacc.h @@ -44,7 +44,7 @@ class CXFA_TextProvider { const CFX_WideString& wsAttr, CFX_WideString& wsValue); - protected: + private: CXFA_WidgetAcc* m_pWidgetAcc; XFA_TEXTPROVIDERTYPE m_eType; CXFA_Node* m_pTextNode; -- cgit v1.2.3