Merge to XFA: Use std::map as CPDF_Dictionary's underlying store.

core/src/fpdfdoc/doc_formcontrol.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 "core/include/fpdfdoc/fpdf_doc.h"
 
 CPDF_FormControl::CPDF_FormControl(CPDF_FormField* pField,
                                    CPDF_Dictionary* pWidgetDict) {
   m_pField = pField;
   m_pWidgetDict = pWidgetDict;
   m_pForm = m_pField->m_pForm;
 }
 CFX_FloatRect CPDF_FormControl::GetRect() const {
   return m_pWidgetDict->GetRect("Rect");
 }
 CFX_ByteString CPDF_FormControl::GetOnStateName() {
   ASSERT(GetType() == CPDF_FormField::CheckBox ||
          GetType() == CPDF_FormField::RadioButton);
   CFX_ByteString csOn;
   CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
   if (!pAP) {
     return csOn;
   }
   CPDF_Dictionary* pN = pAP->GetDict("N");
   if (!pN) {
     return csOn;
   }
-  FX_POSITION pos = pN->GetStartPos();
-  while (pos) {
-    pN->GetNextElement(pos, csOn);
-    if (csOn != "Off") {
-      return csOn;
+  for (const auto& it : *pN) {
+    if (it.first != "Off") {
+      return it.first;
     }
   }
   return CFX_ByteString();
 }
 void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) {
   ASSERT(GetType() == CPDF_FormField::CheckBox ||
          GetType() == CPDF_FormField::RadioButton);
   CFX_ByteString csValue = csOn;
   if (csValue.IsEmpty()) {
     csValue = "Yes";
   }
   if (csValue == "Off") {
     csValue = "Yes";
   }
   CFX_ByteString csAS = m_pWidgetDict->GetString("AS", "Off");
   if (csAS != "Off") {
     m_pWidgetDict->SetAtName("AS", csValue);
   }
   CPDF_Dictionary* pAP = m_pWidgetDict->GetDict("AP");
   if (!pAP) {
     return;
   }
-  FX_POSITION pos1 = pAP->GetStartPos();
-  while (pos1) {
-    CFX_ByteString csKey1;
-    CPDF_Object* pObj1 = pAP->GetNextElement(pos1, csKey1);
+  for (const auto& it : *pAP) {
+    CPDF_Object* pObj1 = it.second;
     if (!pObj1) {
       continue;
     }
     CPDF_Object* pObjDirect1 = pObj1->GetDirect();
     CPDF_Dictionary* pSubDict = pObjDirect1->AsDictionary();
     if (!pSubDict)
       continue;
 
-    FX_POSITION pos2 = pSubDict->GetStartPos();
-    while (pos2) {
-      CFX_ByteString csKey2;
-      CPDF_Object* pObj2 = pSubDict->GetNextElement(pos2, csKey2);
+    for (const auto& subdict_it : *pSubDict) {
+      const CFX_ByteString& csKey2 = subdict_it.first;
+      CPDF_Object* pObj2 = subdict_it.second;
       if (!pObj2) {
         continue;
       }
       if (csKey2 != "Off") {
         pSubDict->ReplaceKey(csKey2, csValue);
         break;
       }
     }
   }
 }
@@ skipping 334 matching lines @@
   return m_pDict ? m_pDict->GetStream(csEntry) : nullptr;
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
   return m_pDict ? m_pDict->GetDict("IF") : nullptr;
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetInteger("TP", TEXTPOS_CAPTION) : TEXTPOS_CAPTION;
 }