From 067e2b4fe59b70291ee19705ba45575ec39feb9d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 Jan 2016 08:54:49 -0800 Subject: Merget to XFA: Use std::map in CPDF_IndirectObjects Review URL: https://codereview.chromium.org/1576113003 . (cherry picked from commit fce548047a44c7015996874452f3e778bf64cad6) TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1579693004 . --- core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp') diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp index d0ca02c17b..5471449f14 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp @@ -8,7 +8,7 @@ #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; @@ -87,12 +87,8 @@ FX_BOOL CFDF_Document::WriteBuf(CFX_ByteTextBuf& buf) const { 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<GetObjNum() << " 0 R>>\r\n%%EOF\r\n"; -- cgit v1.2.3