diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:39:40 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-09 16:39:40 -0800 |
| commit | bd573f126f93acc2034be2df1c6f571670f76c35 (patch) | |
| tree | beeea3b9370bb7490ed5933dadbef857cb8df23d /core/include/fpdfdoc | |
| parent | e021e084717b8cc43f8a0667ad9d1a807dfe381c (diff) | |
| download | pdfium-bd573f126f93acc2034be2df1c6f571670f76c35.tar.xz | |
Merge to XFA: Get rid of most uses of CFX_PtrArray.
Original Review URL: https://codereview.chromium.org/1518593002 .
(cherry picked from commit 035359cd8ddb555fa33b6133db4fd405e4660712)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1513103002 .
Diffstat (limited to 'core/include/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 26 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_tagged.h | 2 |
2 files changed, 9 insertions, 19 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 7a81fd6b6f..3922e1c867 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -753,9 +753,7 @@ class CPDF_FormField { int CountControls() { return m_ControlList.GetSize(); } - CPDF_FormControl* GetControl(int index) { - return (CPDF_FormControl*)m_ControlList.GetAt(index); - } + CPDF_FormControl* GetControl(int index) { return m_ControlList.GetAt(index); } int GetControlIndex(const CPDF_FormControl* pControl); @@ -839,21 +837,8 @@ class CPDF_FormField { protected: CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict); - ~CPDF_FormField(); - CPDF_FormField::Type m_Type; - - FX_DWORD m_Flags; - - CPDF_InterForm* m_pForm; - - CPDF_Dictionary* m_pDict; - - CFX_PtrArray m_ControlList; - friend class CPDF_InterForm; - friend class CPDF_FormControl; - CFX_WideString GetValue(FX_BOOL bDefault); FX_BOOL SetValue(const CFX_WideString& value, @@ -876,9 +861,16 @@ class CPDF_FormField { FX_BOOL bDefault, FX_BOOL bNotify); + CPDF_FormField::Type m_Type; + FX_DWORD m_Flags; + CPDF_InterForm* m_pForm; + CPDF_Dictionary* m_pDict; + CFX_ArrayTemplate<CPDF_FormControl*> m_ControlList; FX_FLOAT m_FontSize; - CPDF_Font* m_pFont; + + friend class CPDF_InterForm; + friend class CPDF_FormControl; }; CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name, diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h index 3de6041dc1..45277fb434 100644 --- a/core/include/fpdfdoc/fpdf_tagged.h +++ b/core/include/fpdfdoc/fpdf_tagged.h @@ -71,8 +71,6 @@ class CPDF_StructElement { virtual const CPDF_StructKid& GetKid(int index) const = 0; - virtual CFX_PtrArray* GetObjectArray() = 0; - virtual CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable = FALSE, |