fpdfsdk/src/fpdfppo.cpp - Issue 1194933003: Make CPDF_Object::GetString() a virtual method.

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/fpdfppo.cpp

Issue 1194933003: Make CPDF_Object::GetString() a virtual method. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: rebase Created 5 years, 5 months 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/fpdfppo.cpp

diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp

index 21ae05d89fd90fbee58959f45bc019983df94b6c..c23cdd457b4c3e378524fc72fe248ac829b0c64e 100644

--- a/fpdfsdk/src/fpdfppo.cpp

+++ b/fpdfsdk/src/fpdfppo.cpp

@@ -53,7 +53,7 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document *pDestPDFDoc, CPDF_Document

DInfoDict->SetAt("Producer", new CPDF_String(producerstr));

//Set type////////////////////////////////////////////////////////////////

- CFX_ByteString cbRootType = pNewRoot->GetString("Type","");

+ CFX_ByteString cbRootType = pNewRoot->GetStringAt("Type", "");

if( cbRootType.Equal("") )

{

pNewRoot->SetAt("Type", new CPDF_Name("Catalog"));

@@ -67,7 +67,7 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document *pDestPDFDoc, CPDF_Document

pNewRoot->SetAt("Pages", new CPDF_Reference(pDestPDFDoc, NewPagesON));

}

- CFX_ByteString cbPageType = pNewPages->GetString("Type","");

+ CFX_ByteString cbPageType = pNewPages->GetStringAt("Type", "");

if(cbPageType.Equal(""))

{

pNewPages->SetAt("Type", new CPDF_Name("Pages"));

@@ -325,7 +325,8 @@ int CPDF_PageOrganizer::GetNewObjId(CPDF_Document *pDoc, CFX_MapPtrToPtr* pMapPt

CPDF_Dictionary* pDictClone = (CPDF_Dictionary*)pClone;

if(pDictClone->KeyExist("Type"))

{

- CFX_ByteString strType = pDictClone->GetString("Type");

+ CFX_ByteString strType =

+ pDictClone->GetStringAt("Type");

if(!FXSYS_stricmp(strType, "Pages"))

{

pDictClone->Release();