Merge to XFA: Get rid of most uses of CFX_PtrArray.

core/include/fpdfdoc/fpdf_doc.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 735 matching lines @@
   FX_DWORD GetFlags() { return m_Flags; }
 
   CPDF_Dictionary* GetFieldDict() const { return m_pDict; }
 
   void SetFieldDict(CPDF_Dictionary* pDict) { m_pDict = pDict; }
 
   FX_BOOL ResetField(FX_BOOL bNotify = FALSE);
 
   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);
 
   int GetFieldType();
 
   CPDF_AAction GetAdditionalAction();
 
   CFX_WideString GetAlternateName();
 
   CFX_WideString GetMappingName();
@@ skipping 63 matching lines @@
                    int index = -1,
                    FX_BOOL bNotify = FALSE);
 #endif  // PDF_ENABLE_XFA
 
   FX_FLOAT GetFontSize() { return m_FontSize; }
 
   CPDF_Font* GetFont() { return m_pFont; }
 
  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,
                    FX_BOOL bDefault,
                    FX_BOOL bNotify);
 
   void SyncFieldFlags();
 
   int FindListSel(CPDF_String* str);
 
   CFX_WideString GetOptionText(int index, int sub_index);
 
   void LoadDA();
 
   void UpdateAP(CPDF_FormControl* pControl);
 
   CFX_WideString GetCheckValue(FX_BOOL bDefault);
 
   FX_BOOL SetCheckValue(const CFX_WideString& value,
                         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;
 
-  CPDF_Font* m_pFont;
+  friend class CPDF_InterForm;
+  friend class CPDF_FormControl;
 };
 CPDF_Object* FPDF_GetFieldAttr(CPDF_Dictionary* pFieldDict,
                                const FX_CHAR* name,
                                int nLevel = 0);
 class CPDF_IconFit {
  public:
   // TODO(thestig): Examine why this cannot be explicit.
   CPDF_IconFit(CPDF_Dictionary* pDict = NULL) { m_pDict = pDict; }
 
   operator CPDF_Dictionary*() const { return m_pDict; }
@@ skipping 273 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_