Merge to XFA: Remove CFX_PtrArray usage in fpdfsdk.

fpdfsdk/src/javascript/Document.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 "Document.h"
 
 #include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 502 matching lines @@
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CFX_WideString sFieldName = params[0].ToCFXWideString();
   CPDFSDK_InterForm* pInterForm =
       (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
   ASSERT(pInterForm != NULL);
 
-  CFX_PtrArray widgets;
-  pInterForm->GetWidgets(sFieldName, widgets);
+  std::vector<CPDFSDK_Widget*> widgets;
+  pInterForm->GetWidgets(sFieldName, &widgets);
 
-  int nSize = widgets.GetSize();
+  if (widgets.empty())
+    return TRUE;
 
-  if (nSize > 0) {
-    for (int i = 0; i < nSize; i++) {
-      CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)widgets[i];
-      ASSERT(pWidget != NULL);
+  for (CPDFSDK_Widget* pWidget : widgets) {
+    CPDF_Rect rcAnnot = pWidget->GetRect();
+    --rcAnnot.left;
+    --rcAnnot.bottom;
+    ++rcAnnot.right;
+    ++rcAnnot.top;
 
-      CPDF_Rect rcAnnot = pWidget->GetRect();
-      rcAnnot.left -= 1;
-      rcAnnot.bottom -= 1;
-      rcAnnot.right += 1;
-      rcAnnot.top += 1;
+    CFX_RectArray aRefresh;
+    aRefresh.Add(rcAnnot);
 
-      CFX_RectArray aRefresh;
-      aRefresh.Add(rcAnnot);
+    CPDFXFA_Page* pPage = pWidget->GetPDFXFAPage();
+    ASSERT(pPage);
 
-      CPDFXFA_Page* pPage = pWidget->GetPDFXFAPage();
-      ASSERT(pPage != NULL);
-
-      CPDFSDK_PageView* pPageView = m_pDocument->GetPageView(pPage);
-      pPageView->DeleteAnnot(pWidget);
-
-      pPageView->UpdateRects(aRefresh);
-    }
-    m_pDocument->SetChangeMark();
+    CPDFSDK_PageView* pPageView = m_pDocument->GetPageView(pPage);
+    pPageView->DeleteAnnot(pWidget);
+    pPageView->UpdateRects(aRefresh);
   }
+  m_pDocument->SetChangeMark();
 
   return TRUE;
 }
 
 // reset filed values within a document.
 // comment:
 // note: if the fields names r not rational, aodbe is dumb for it.
 
 FX_BOOL Document::resetForm(IJS_Context* cc,
                             const CJS_Parameters& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
   if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
         m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM) ||
         m_pDocument->GetPermissions(FPDFPERM_FILL_FORM)))
     return FALSE;
 
   CPDFSDK_InterForm* pInterForm =
       (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array aName(pRuntime);
 
-  if (params.size() > 0) {
-    switch (params[0].GetType()) {
-      default:
-        aName.Attach(params[0].ToV8Array());
-        break;
-      case CJS_Value::VT_string:
-        aName.SetElement(0, params[0]);
-        break;
-    }
+  // TODO(thestig) Convert CJS_Parameters to a std::vector and use .empty().
+  if (params.size() <= 0) {
+    pPDFForm->ResetForm(TRUE);
+    m_pDocument->SetChangeMark();
+    return TRUE;
+  }
 
-    CFX_PtrArray aFields;
+  switch (params[0].GetType()) {
+    default:
+      aName.Attach(params[0].ToV8Array());
+      break;
+    case CJS_Value::VT_string:
+      aName.SetElement(0, params[0]);
+      break;
+  }
 
-    for (int i = 0, isz = aName.GetLength(); i < isz; i++) {
-      CJS_Value valElement(pRuntime);
-      aName.GetElement(i, valElement);
-      CFX_WideString swVal = valElement.ToCFXWideString();
-      for (int j = 0, jsz = pPDFForm->CountFields(swVal); j < jsz; j++) {
-        aFields.Add((void*)pPDFForm->GetField(j, swVal));
-      }
-    }
+  std::vector<CPDF_FormField*> aFields;
+  for (int i = 0, isz = aName.GetLength(); i < isz; ++i) {
+    CJS_Value valElement(pRuntime);
+    aName.GetElement(i, valElement);
+    CFX_WideString swVal = valElement.ToCFXWideString();
+    for (int j = 0, jsz = pPDFForm->CountFields(swVal); j < jsz; ++j)
+      aFields.push_back(pPDFForm->GetField(j, swVal));
+  }
 
-    if (aFields.GetSize() > 0) {
-      pPDFForm->ResetForm(aFields, TRUE, TRUE);
-      m_pDocument->SetChangeMark();
-    }
-  } else {
-    pPDFForm->ResetForm(TRUE);
+  if (!aFields.empty()) {
+    pPDFForm->ResetForm(aFields, TRUE, TRUE);
     m_pDocument->SetChangeMark();
   }
 
   return TRUE;
 }
 
 FX_BOOL Document::saveAs(IJS_Context* cc,
                          const CJS_Parameters& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
@@ skipping 44 matching lines @@
     pValue = FXJS_GetObjectElement(isolate, pObj, L"aFields");
     aFields.Attach(
         CJS_Value(pRuntime, pValue, GET_VALUE_TYPE(pValue)).ToV8Array());
   }
 
   CPDFSDK_InterForm* pInterForm =
       (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
   FX_BOOL bAll = (aFields.GetLength() == 0);
   if (bAll && bEmpty) {
-    if (pPDFInterForm->CheckRequiredFields()) {
+    if (pPDFInterForm->CheckRequiredFields(nullptr, true)) {
       pRuntime->BeginBlock();
       pInterForm->SubmitForm(strURL, FALSE);
       pRuntime->EndBlock();
     }
     return TRUE;
   }
 
-  CFX_PtrArray fieldObjects;
-  for (int i = 0, sz = aFields.GetLength(); i < sz; i++) {
+  std::vector<CPDF_FormField*> fieldObjects;
+  for (int i = 0, sz = aFields.GetLength(); i < sz; ++i) {
     CJS_Value valName(pRuntime);
     aFields.GetElement(i, valName);
 
     CFX_WideString sName = valName.ToCFXWideString();
     CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
     for (int j = 0, jsz = pPDFForm->CountFields(sName); j < jsz; ++j) {
       CPDF_FormField* pField = pPDFForm->GetField(j, sName);
       if (!bEmpty && pField->GetValue().IsEmpty())
         continue;
 
-      fieldObjects.Add(pField);
+      fieldObjects.push_back(pField);
     }
   }
 
-  if (pPDFInterForm->CheckRequiredFields(&fieldObjects, TRUE)) {
+  if (pPDFInterForm->CheckRequiredFields(&fieldObjects, true)) {
     pRuntime->BeginBlock();
     pInterForm->SubmitFields(strURL, fieldObjects, TRUE, !bFDF);
     pRuntime->EndBlock();
   }
   return TRUE;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
 void Document::AttachDoc(CPDFSDK_Document* pDoc) {
@@ skipping 1130 matching lines @@
   CFX_DWordArray DelArray;
 
   for (int j = DelArray.GetSize() - 1; j >= 0; j--) {
     m_DelayData.RemoveAt(DelArray[j]);
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }