fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp - Issue 1541703003: Use std::map as CPDF_Dictionary's underlying store.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

Issue 1541703003: Use std::map as CPDF_Dictionary's underlying store. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: XFA still uses CFX_CMapByteStringToPtr :( Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

index dd58180e61a4a9e2ab625cd27a9a898538223757..90612243bdbeb412860ce10768c144973244ea32 100644

--- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

+++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

@@ -127,11 +127,9 @@ CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict,

CPDF_Font* pFind = NULL;

- FX_POSITION pos = pFonts->GetStartPos();

- while (pos) {

- CPDF_Object* pObj = NULL;

- CFX_ByteString csKey;

- pObj = pFonts->GetNextElement(pos, csKey);

+ for (const auto& it : *pFonts) {

+ const CFX_ByteString& csKey = it.first;

+ CPDF_Object* pObj = it.second;

if (!pObj)

continue;