Merge to XFA: Remove CFX_PtrArray usage in fpdfsdk.

core/src/fpdfdoc/doc_action.cpp

 // 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
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
   if (!m_pDict) {
     return CPDF_Dest();
@@ skipping 93 matching lines @@
   if (!pFields)
     return 0;
   if (pFields->IsDictionary())
     return 1;
   if (pFields->IsString())
     return 1;
   if (CPDF_Array* pArray = pFields->AsArray())
     return pArray->GetCount();
   return 0;
 }
-void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const {
-  fieldObjects.RemoveAll();
-  if (m_pAction == NULL) {
-    return;
-  }
+
+std::vector<CPDF_Object*> CPDF_ActionFields::GetAllFields() const {
+  std::vector<CPDF_Object*> fields;
+  if (!m_pAction)
+    return fields;
+
   CPDF_Dictionary* pDict = m_pAction->GetDict();
-  if (pDict == NULL) {
-    return;
-  }
+  if (!pDict)
+    return fields;
+
   CFX_ByteString csType = pDict->GetString("S");
-  CPDF_Object* pFields = NULL;
-  if (csType == "Hide") {
+  CPDF_Object* pFields;
+  if (csType == "Hide")
     pFields = pDict->GetElementValue("T");
-  } else {
+  else
     pFields = pDict->GetArray("Fields");
-  }
   if (!pFields)
-    return;
+    return fields;
 
   if (pFields->IsDictionary() || pFields->IsString()) {
-    fieldObjects.Add(pFields);
+    fields.push_back(pFields);
   } else if (CPDF_Array* pArray = pFields->AsArray()) {
     FX_DWORD iCount = pArray->GetCount();
-    for (FX_DWORD i = 0; i < iCount; i++) {
+    for (FX_DWORD i = 0; i < iCount; ++i) {
       CPDF_Object* pObj = pArray->GetElementValue(i);
-      if (pObj != NULL) {
-        fieldObjects.Add(pObj);
+      if (pObj) {
+        fields.push_back(pObj);
       }
     }
   }
+  return fields;
 }
+
 CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const {
   if (m_pAction == NULL) {
     return NULL;
   }
   CPDF_Dictionary* pDict = m_pAction->GetDict();
   if (pDict == NULL) {
     return NULL;
   }
   CFX_ByteString csType = pDict->GetString("S");
   CPDF_Object* pFields = NULL;
@@ skipping 129 matching lines @@
   int i = 0;
   while (g_sAATypes[i][0] != '\0') {
     if (csKey == g_sAATypes[i]) {
       break;
     }
     i++;
   }
   eType = (AActionType)i;
   return CPDF_Action(pDict);
 }
-CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) {
-  m_pDocument = pDoc;
-}
+
+CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
+
 int CPDF_DocJSActions::CountJSActions() const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   return name_tree.GetCount();
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(int index,
                                            CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   CPDF_Object* pAction = name_tree.LookupValue(index, csName);
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   CPDF_Object* pAction = name_tree.LookupValue(csName);
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   return name_tree.GetIndex(csName);
 }