Merget to XFA: Use std::map in CPDF_IndirectObjects

core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.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/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fpdfapi/fpdf_serial.h"
 
-CFDF_Document::CFDF_Document() : CPDF_IndirectObjects(NULL) {
+CFDF_Document::CFDF_Document() : CPDF_IndirectObjectHolder(NULL) {
   m_pRootDict = NULL;
   m_pFile = NULL;
   m_bOwnFile = FALSE;
 }
 CFDF_Document::~CFDF_Document() {
   if (m_bOwnFile && m_pFile) {
     m_pFile->Release();
   }
 }
 CFDF_Document* CFDF_Document::CreateNewDoc() {
@@ skipping 58 matching lines @@
       }
       break;
     }
   }
 }
 FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const {
   if (!m_pRootDict) {
     return FALSE;
   }
   buf << "%FDF-1.2\r\n";
-  FX_POSITION pos = m_IndirectObjs.GetStartPosition();
-  while (pos) {
-    size_t objnum;
-    CPDF_Object* pObj;
-    m_IndirectObjs.GetNextAssoc(pos, (void*&)objnum, (void*&)pObj);
-    buf << (FX_DWORD)objnum << " 0 obj\r\n" << pObj << "\r\nendobj\r\n\r\n";
+  for (const auto& pair : m_IndirectObjs) {
+    buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
   }
   buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
       << " 0 R>>\r\n%%EOF\r\n";
   return TRUE;
 }
 CFX_WideString CFDF_Document::GetWin32Path() const {
   CPDF_Dictionary* pDict = m_pRootDict ? m_pRootDict->GetDict("FDF") : NULL;
   CPDF_Object* pFileSpec = pDict ? pDict->GetElementValue("F") : NULL;
   if (!pFileSpec)
     return CFX_WideString();
@@ skipping 66 matching lines @@
     result += wsFileName[1];
     result += ':';
     result += ChangeSlash(wsFileName.c_str() + 2);
     return result;
   }
   CFX_WideString result;
   result += '\\';
   result += ChangeSlash(wsFileName.c_str());
   return result;
 }