Remove CFX_PtrArray usage in fpdfsdk.

fpdfsdk/include/fsdk_baseform.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 FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 167 matching lines @@
   explicit CPDFSDK_InterForm(CPDFSDK_Document* pDocument);
   ~CPDFSDK_InterForm() override;
 
   CPDF_InterForm* GetInterForm() const { return m_pInterForm; }
   CPDFSDK_Document* GetDocument() const { return m_pDocument; }
 
   FX_BOOL HighlightWidgets();
 
   CPDFSDK_Widget* GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const;
   CPDFSDK_Widget* GetWidget(CPDF_FormControl* pControl) const;
-  void GetWidgets(const CFX_WideString& sFieldName, CFX_PtrArray& widgets);
-  void GetWidgets(CPDF_FormField* pField, CFX_PtrArray& widgets);
+  void GetWidgets(const CFX_WideString& sFieldName,

[Tom Sepez, 2015/11/09 21:25:31]

nit: as before, do we just want to return this and count on c++11 move
semantics?  We should be consistent.  I think we may have to go this way for
now.  Hmmm.

[Lei Zhang, 2015/11/09 22:45:28]

I vaguely remember these may take an existing list and append to them. The ones
that return a std::vector starts with an empty vector for sure.

+                  std::vector<CPDFSDK_Widget*>* widgets) const;
+  void GetWidgets(CPDF_FormField* pField,
+                  std::vector<CPDFSDK_Widget*>* widgets) const;
 
   void AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget);
   void RemoveMap(CPDF_FormControl* pControl);
 
   void EnableCalculate(FX_BOOL bEnabled);
   FX_BOOL IsCalculateEnabled() const;
 
 #ifdef _WIN32
   CPDF_Stream* LoadImageFromFile(const CFX_WideString& sFile);
 #endif
@@ skipping 10 matching lines @@
   void ResetFieldAppearance(CPDF_FormField* pFormField,
                             const FX_WCHAR* sValue,
                             FX_BOOL bValueChanged);
   void UpdateField(CPDF_FormField* pFormField);
 
   FX_BOOL DoAction_Hide(const CPDF_Action& action);
   FX_BOOL DoAction_SubmitForm(const CPDF_Action& action);
   FX_BOOL DoAction_ResetForm(const CPDF_Action& action);
   FX_BOOL DoAction_ImportData(const CPDF_Action& action);
 
-  void GetFieldFromObjects(const CFX_PtrArray& objects, CFX_PtrArray& fields);
+  std::vector<CPDF_FormField*> GetFieldFromObjects(

[Tom Sepez, 2015/11/09 21:25:31]

And here too.

[Lei Zhang, 2015/11/09 22:45:28]

Acknowledged.

+      const std::vector<CPDF_Object*>& objects) const;
   FX_BOOL IsValidField(CPDF_Dictionary* pFieldDict);
   FX_BOOL SubmitFields(const CFX_WideString& csDestination,
-                       const CFX_PtrArray& fields,
+                       const std::vector<CPDF_FormField*>& fields,
                        FX_BOOL bIncludeOrExclude,
                        FX_BOOL bUrlEncoded);
   FX_BOOL SubmitForm(const CFX_WideString& sDestination, FX_BOOL bUrlEncoded);
   FX_BOOL ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf);
-  FX_BOOL ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,
+  FX_BOOL ExportFieldsToFDFTextBuf(const std::vector<CPDF_FormField*>& fields,
                                    FX_BOOL bIncludeOrExclude,
                                    CFX_ByteTextBuf& textBuf);
   CFX_WideString GetTemporaryFileName(const CFX_WideString& sFileExt);
 
  private:
   // CPDF_FormNotify
   int BeforeValueChange(const CPDF_FormField* pField,
                         CFX_WideString& csValue) override;
   int AfterValueChange(const CPDF_FormField* pField) override;
   int BeforeSelectionChange(const CPDF_FormField* pField,
@@ skipping 59 matching lines @@
   static CPDF_Rect GetAnnotRect(CPDFSDK_Annot* pAnnot);
 
   CPDFSDK_PageView* m_pPageView;
   CFX_ByteString m_sType;
   CFX_ByteString m_sSubType;
   int m_nTabs;
   CPDFSDK_Annots m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_