Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

core/src/fpdfdoc/doc_form.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"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
@@ skipping 836 matching lines @@
   return pArray->GetCount();
 }
 CPDF_FormField* CPDF_InterForm::GetFieldInCalculationOrder(int index) {
   if (m_pFormDict == NULL || index < 0) {
     return NULL;
   }
   CPDF_Array* pArray = m_pFormDict->GetArray("CO");
   if (pArray == NULL) {
     return NULL;
   }
-  CPDF_Object* pElement = pArray->GetElementValue(index);
-  if (pElement != NULL && pElement->GetType() == PDFOBJ_DICTIONARY) {
-    return GetFieldByDict((CPDF_Dictionary*)pElement);
+  if (CPDF_Dictionary* pElement =
+          ToDictionary(pArray->GetElementValue(index))) {
+    return GetFieldByDict(pElement);
   }
   return NULL;
 }
 int CPDF_InterForm::FindFieldInCalculationOrder(const CPDF_FormField* pField) {
   if (m_pFormDict == NULL || pField == NULL) {
     return -1;
   }
   CPDF_Array* pArray = m_pFormDict->GetArray("CO");
   if (pArray == NULL) {
     return -1;
@@ skipping 172 matching lines @@
     return;
   }
   int iAnnotCount = pAnnots->GetCount();
   for (int i = 0; i < iAnnotCount; i++) {
     CPDF_Dictionary* pAnnot = pAnnots->GetDict(i);
     if (pAnnot != NULL && pAnnot->GetString(FX_BSTRC("Subtype")) == "Widget") {
       LoadField(pAnnot);
     }
   }
 }
-CPDF_FormField* CPDF_InterForm::AddTerminalField(
-    const CPDF_Dictionary* pFieldDict) {
+CPDF_FormField* CPDF_InterForm::AddTerminalField(CPDF_Dictionary* pFieldDict) {
   if (!pFieldDict->KeyExist(FX_BSTRC("T"))) {
     return NULL;
   }
-  CPDF_Dictionary* pDict = (CPDF_Dictionary*)pFieldDict;
-  CFX_WideString csWName = GetFullName(pDict);
+  CPDF_Dictionary* pDict = pFieldDict;
+  CFX_WideString csWName = GetFullName(pFieldDict);
   if (csWName.IsEmpty()) {
     return NULL;
   }
   CPDF_FormField* pField = NULL;
   pField = m_pFieldTree->GetField(csWName);
   if (pField == NULL) {
-    CPDF_Dictionary* pParent = (CPDF_Dictionary*)pFieldDict;
+    CPDF_Dictionary* pParent = pFieldDict;
     if (!pFieldDict->KeyExist(FX_BSTRC("T")) &&
         pFieldDict->GetString(FX_BSTRC("Subtype")) == FX_BSTRC("Widget")) {
       pParent = pFieldDict->GetDict(FX_BSTRC("Parent"));
       if (!pParent) {
-        pParent = (CPDF_Dictionary*)pFieldDict;
+        pParent = pFieldDict;
       }
     }
     if (pParent && pParent != pFieldDict &&
         !pParent->KeyExist(FX_BSTRC("FT"))) {
       if (pFieldDict->KeyExist(FX_BSTRC("FT"))) {
         CPDF_Object* pFTValue = pFieldDict->GetElementValue(FX_BSTRC("FT"));
         if (pFTValue) {
           pParent->SetAt(FX_BSTRC("FT"), pFTValue->Clone());
         }
       }
@@ skipping 28 matching lines @@
         continue;
       }
       if (pKid->GetString("Subtype") != "Widget") {
         continue;
       }
       AddControl(pField, pKid);
     }
   }
   return pField;
 }
-CPDF_FormControl* CPDF_InterForm::AddControl(
-    const CPDF_FormField* pField,
-    const CPDF_Dictionary* pWidgetDict) {
+CPDF_FormControl* CPDF_InterForm::AddControl(const CPDF_FormField* pField,
+                                             CPDF_Dictionary* pWidgetDict) {
   const auto it = m_ControlMap.find(pWidgetDict);
   if (it != m_ControlMap.end())
     return it->second;
 
-  CPDF_FormControl* pControl = new CPDF_FormControl(
-      (CPDF_FormField*)pField, (CPDF_Dictionary*)pWidgetDict);
+  CPDF_FormControl* pControl =
+      new CPDF_FormControl((CPDF_FormField*)pField, pWidgetDict);
   m_ControlMap[pWidgetDict] = pControl;
   ((CPDF_FormField*)pField)->m_ControlList.Add(pControl);
   return pControl;
 }
 CPDF_FormField* CPDF_InterForm::CheckRequiredFields(
     const CFX_PtrArray* fields,
     FX_BOOL bIncludeOrExclude) const {
   int nCount = m_pFieldTree->m_Root.CountFields();
   for (int i = 0; i < nCount; i++) {
     CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(i);
@@ skipping 235 matching lines @@
     FDF_ImportField(pField, L"", bNotify);
   }
   if (bNotify && m_pFormNotify != NULL) {
     m_pFormNotify->AfterFormImportData(this);
   }
   return TRUE;
 }
 void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
   m_pFormNotify = (CPDF_FormNotify*)pNotify;
 }