Remove CFX_PtrArray usage in fpdfsdk.

fpdfsdk/src/fsdk_baseform.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/formfiller/FFL_FormFiller.h"
 #include "../include/fsdk_actionhandler.h"
 #include "../include/fsdk_baseannot.h"
 #include "../include/fsdk_baseform.h"
@@ skipping 942 matching lines @@
     pEdit->SetAlignmentV(1);
 
     FX_FLOAT fFontSize = GetFontSize();
     if (IsFloatZero(fFontSize))
       pEdit->SetAutoFontSize(TRUE);
     else
       pEdit->SetFontSize(fFontSize);
 
     pEdit->Initialize();
 
-    if (sValue)
+    if (sValue) {
       pEdit->SetText(sValue);
-    else {
+    } else {
       int32_t nCurSel = pField->GetSelectedIndex(0);
 
       if (nCurSel < 0)
         pEdit->SetText(pField->GetValue().c_str());
       else
         pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str());
     }
 
     CPDF_Rect rcContent = pEdit->GetContentRect();
 
@@ skipping 606 matching lines @@
     if (nPageIndex >= 0) {
       pPage = m_pDocument->GetPageView(nPageIndex);
     }
   }
 
   if (!pPage)
     return nullptr;
   return (CPDFSDK_Widget*)pPage->GetAnnotByDict(pControlDict);
 }
 
-void CPDFSDK_InterForm::GetWidgets(const CFX_WideString& sFieldName,
-                                   CFX_PtrArray& widgets) {
-  ASSERT(m_pInterForm != NULL);
-
-  for (int i = 0, sz = m_pInterForm->CountFields(sFieldName); i < sz; i++) {
+void CPDFSDK_InterForm::GetWidgets(
+    const CFX_WideString& sFieldName,
+    std::vector<CPDFSDK_Widget*>* widgets) const {
+  for (int i = 0, sz = m_pInterForm->CountFields(sFieldName); i < sz; ++i) {
     CPDF_FormField* pFormField = m_pInterForm->GetField(i, sFieldName);
-    ASSERT(pFormField != NULL);
-
+    ASSERT(pFormField);
     GetWidgets(pFormField, widgets);
   }
 }
 
-void CPDFSDK_InterForm::GetWidgets(CPDF_FormField* pField,
-                                   CFX_PtrArray& widgets) {
-  ASSERT(pField != NULL);
-
-  for (int i = 0, isz = pField->CountControls(); i < isz; i++) {
+void CPDFSDK_InterForm::GetWidgets(
+    CPDF_FormField* pField,
+    std::vector<CPDFSDK_Widget*>* widgets) const {

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

I guess we don't want to first clear |widgets| here, but it seems like we
should.

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

No, I think some caller are appending to |widgets|, so we do not want to clear
it.

+  for (int i = 0, sz = pField->CountControls(); i < sz; ++i) {
     CPDF_FormControl* pFormCtrl = pField->GetControl(i);
-    ASSERT(pFormCtrl != NULL);
-
+    ASSERT(pFormCtrl);
     CPDFSDK_Widget* pWidget = GetWidget(pFormCtrl);
-
     if (pWidget)
-      widgets.Add(pWidget);
+      widgets->push_back(pWidget);
   }
 }
 
 int CPDFSDK_InterForm::GetPageIndexByAnnotDict(
     CPDF_Document* pDocument,
     CPDF_Dictionary* pAnnotDict) const {
   ASSERT(pDocument != NULL);
   ASSERT(pAnnotDict != NULL);
 
   for (int i = 0, sz = pDocument->GetPageCount(); i < sz; i++) {
@@ skipping 299 matching lines @@
     }
   }
 }
 
 /* ----------------------------- action ----------------------------- */
 
 FX_BOOL CPDFSDK_InterForm::DoAction_Hide(const CPDF_Action& action) {
   ASSERT(action);
 
   CPDF_ActionFields af = action.GetWidgets();
-  CFX_PtrArray fieldObjects;
-  af.GetAllFields(fieldObjects);
-  CFX_PtrArray widgetArray;
-  CFX_PtrArray fields;
-  GetFieldFromObjects(fieldObjects, fields);
+  std::vector<CPDF_Object*> fieldObjects = af.GetAllFields();
+  std::vector<CPDF_FormField*> fields = GetFieldFromObjects(fieldObjects);
 
   FX_BOOL bHide = action.GetHideStatus();
-
   FX_BOOL bChanged = FALSE;
 
-  for (int i = 0, sz = fields.GetSize(); i < sz; i++) {
-    CPDF_FormField* pField = (CPDF_FormField*)fields[i];
-    ASSERT(pField != NULL);
-
-    for (int j = 0, jsz = pField->CountControls(); j < jsz; j++) {
-      CPDF_FormControl* pControl = pField->GetControl(j);
+  for (CPDF_FormField* pField : fields) {
+    for (int i = 0, sz = pField->CountControls(); i < sz; ++i) {
+      CPDF_FormControl* pControl = pField->GetControl(i);
       ASSERT(pControl != NULL);

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

nit: just ASSERT(pControl)

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

Done.

 
       if (CPDFSDK_Widget* pWidget = GetWidget(pControl)) {
         int nFlags = pWidget->GetFlags();
         if (bHide) {
           nFlags &= (~ANNOTFLAG_INVISIBLE);

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

nit: overparenthesization.

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

Done.

           nFlags &= (~ANNOTFLAG_NOVIEW);
           nFlags |= (ANNOTFLAG_HIDDEN);
         } else {
           nFlags &= (~ANNOTFLAG_INVISIBLE);
           nFlags &= (~ANNOTFLAG_HIDDEN);

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

nit: two of these occur in both branches.

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

Done.

           nFlags &= (~ANNOTFLAG_NOVIEW);
         }
         pWidget->SetFlags(nFlags);
 
         CPDFSDK_PageView* pPageView = pWidget->GetPageView();
         ASSERT(pPageView != NULL);

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

nit: not needed, segv on 1957.

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

Done.

 
         pPageView->UpdateView(pWidget);
 
         bChanged = TRUE;
       }
     }
   }
 
   return bChanged;
 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_SubmitForm(const CPDF_Action& action) {
   ASSERT(m_pInterForm != NULL);
   CFX_WideString sDestination = action.GetFilePath();
   if (sDestination.IsEmpty())
     return FALSE;
 
   CPDF_Dictionary* pActionDict = action.GetDict();
   if (pActionDict->KeyExist("Fields")) {
     CPDF_ActionFields af = action.GetWidgets();
     FX_DWORD dwFlags = action.GetFlags();
-    CFX_PtrArray fieldObjects;
-    af.GetAllFields(fieldObjects);
-
-    CFX_PtrArray fields;
-    GetFieldFromObjects(fieldObjects, fields);
-    if (fields.GetSize() != 0) {
+    std::vector<CPDF_Object*> fieldObjects = af.GetAllFields();
+    std::vector<CPDF_FormField*> fields = GetFieldFromObjects(fieldObjects);
+    if (!fields.empty()) {
       FX_BOOL bIncludeOrExclude = !(dwFlags & 0x01);
       if (m_pInterForm->CheckRequiredFields(&fields, bIncludeOrExclude))
         return FALSE;
 
       return SubmitFields(sDestination, fields, bIncludeOrExclude, FALSE);
     }
   }
-  if (m_pInterForm->CheckRequiredFields())
+  if (m_pInterForm->CheckRequiredFields(nullptr, TRUE))
     return FALSE;
 
   return SubmitForm(sDestination, FALSE);
 }
 
-FX_BOOL CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination,
-                                        const CFX_PtrArray& fields,
-                                        FX_BOOL bIncludeOrExclude,
-                                        FX_BOOL bUrlEncoded) {
+FX_BOOL CPDFSDK_InterForm::SubmitFields(
+    const CFX_WideString& csDestination,
+    const std::vector<CPDF_FormField*>& fields,
+    FX_BOOL bIncludeOrExclude,
+    FX_BOOL bUrlEncoded) {
   CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();

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

nit:  move to 2012, lose assert.

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

Done.

   ASSERT(pEnv != NULL);
 
   CFX_ByteTextBuf textBuf;
   ExportFieldsToFDFTextBuf(fields, bIncludeOrExclude, textBuf);
 
   uint8_t* pBuffer = textBuf.GetBuffer();
   FX_STRSIZE nBufSize = textBuf.GetLength();
 
   if (bUrlEncoded) {

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

nit: combine.

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

Done.

     if (!FDFToURLEncodedData(pBuffer, nBufSize))
       return FALSE;
   }
 
   pEnv->JS_docSubmitForm(pBuffer, nBufSize, csDestination.c_str());
 
   return TRUE;
 }
 
 FX_BOOL CPDFSDK_InterForm::FDFToURLEncodedData(CFX_WideString csFDFFile,
@@ skipping 37 matching lines @@
         fdfEncodedData = fdfEncodedData << "&";
     }
 
     nBufSize = fdfEncodedData.GetLength();
     pBuf = FX_Alloc(uint8_t, nBufSize);
     FXSYS_memcpy(pBuf, fdfEncodedData.GetBuffer(), nBufSize);
   }
   return TRUE;
 }
 
-FX_BOOL CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,
-                                                    FX_BOOL bIncludeOrExclude,
-                                                    CFX_ByteTextBuf& textBuf) {
-  ASSERT(m_pDocument != NULL);
-  ASSERT(m_pInterForm != NULL);
-
-  CFDF_Document* pFDF = m_pInterForm->ExportToFDF(
-      m_pDocument->GetPath(), (CFX_PtrArray&)fields, bIncludeOrExclude);
-  if (!pFDF)
-    return FALSE;
-  FX_BOOL bRet = pFDF->WriteBuf(textBuf);
-  delete pFDF;
-
-  return bRet;
+FX_BOOL CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(
+    const std::vector<CPDF_FormField*>& fields,
+    FX_BOOL bIncludeOrExclude,
+    CFX_ByteTextBuf& textBuf) {
+  nonstd::unique_ptr<CFDF_Document> pFDF(m_pInterForm->ExportToFDF(
+      m_pDocument->GetPath(), fields, bIncludeOrExclude));
+  return pFDF ? pFDF->WriteBuf(textBuf) : FALSE;
 }
 
 CFX_WideString CPDFSDK_InterForm::GetTemporaryFileName(
     const CFX_WideString& sFileExt) {
   CFX_WideString sFileName;
   return L"";
 }
 
 FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination,
                                       FX_BOOL bUrlEncoded) {
@@ skipping 48 matching lines @@
   FX_BOOL bRet = pFDF->WriteBuf(textBuf);
   delete pFDF;
 
   return bRet;
 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_ResetForm(const CPDF_Action& action) {
   ASSERT(action);
 
   CPDF_Dictionary* pActionDict = action.GetDict();
-  if (pActionDict->KeyExist("Fields")) {
-    CPDF_ActionFields af = action.GetWidgets();
-    FX_DWORD dwFlags = action.GetFlags();
+  if (!pActionDict->KeyExist("Fields"))
+    return m_pInterForm->ResetForm(true);
 
-    CFX_PtrArray fieldObjects;
-    af.GetAllFields(fieldObjects);
-    CFX_PtrArray fields;
-    GetFieldFromObjects(fieldObjects, fields);
-    return m_pInterForm->ResetForm(fields, !(dwFlags & 0x01), TRUE);
-  }
+  CPDF_ActionFields af = action.GetWidgets();
+  FX_DWORD dwFlags = action.GetFlags();
 
-  return m_pInterForm->ResetForm(TRUE);
+  std::vector<CPDF_Object*> fieldObjects = af.GetAllFields();
+  std::vector<CPDF_FormField*> fields = GetFieldFromObjects(fieldObjects);
+  return m_pInterForm->ResetForm(fields, !(dwFlags & 0x01), true);

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

nit: magic numbers again for dwFlags.

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

Acknowledged.

 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_ImportData(const CPDF_Action& action) {
   return FALSE;
 }
 
-void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects,
-                                            CFX_PtrArray& fields) {
-  ASSERT(m_pInterForm != NULL);
-
-  int iCount = objects.GetSize();
-  for (int i = 0; i < iCount; i++) {
-    CPDF_Object* pObject = static_cast<CPDF_Object*>(objects[i]);
-    if (!pObject)
-      continue;
-
-    if (pObject->IsString()) {
+std::vector<CPDF_FormField*> CPDFSDK_InterForm::GetFieldFromObjects(
+    const std::vector<CPDF_Object*>& objects) const {
+  std::vector<CPDF_FormField*> fields;
+  for (CPDF_Object* pObject : objects) {
+    if (pObject && pObject->IsString()) {
       CFX_WideString csName = pObject->GetUnicodeText();
       CPDF_FormField* pField = m_pInterForm->GetField(0, csName);
       if (pField)
-        fields.Add(pField);
-    } else if (pObject->IsDictionary()) {
-      if (m_pInterForm->IsValidFormField(pObject))
-        fields.Add(pObject);
+        fields.push_back(pField);
     }
   }
+  return fields;
 }
 
 /* ----------------------------- CPDF_FormNotify -----------------------------
  */
 
 int CPDFSDK_InterForm::BeforeValueChange(const CPDF_FormField* pField,
                                          CFX_WideString& csValue) {
   CPDF_FormField* pFormField = (CPDF_FormField*)pField;
   int nType = pFormField->GetFieldType();
   if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD) {
@@ skipping 341 matching lines @@
       break;
     }
   }
 }
 
 CPDF_Rect CBA_AnnotIterator::GetAnnotRect(CPDFSDK_Annot* pAnnot) {
   CPDF_Rect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }