diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-18 17:05:11 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-18 17:05:11 -0800 |
| commit | 4880d1a168729d42be736293fb93b514802e4f12 (patch) | |
| tree | 9cfe5aa73113301487dce8bcef5139fb7295536a /fpdfsdk/src/fpdfppo.cpp | |
| parent | aedd4555ec1a80121f176586cb72180337e4ccd8 (diff) | |
| download | pdfium-4880d1a168729d42be736293fb93b514802e4f12.tar.xz | |
Merge to XFA: Get rid of a few CPDF_Object Create() methods and just use new instead.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1540693002 .
(cherry picked from commit d866ab0b44a571c884fdd8ba5a5319adaf607559)
Review URL: https://codereview.chromium.org/1541563002 .
Diffstat (limited to 'fpdfsdk/src/fpdfppo.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfppo.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 513ffc4ade..2fce7adfc4 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -43,17 +43,16 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc, if (!pNewRoot) return FALSE; - // Set the document information//////////////////////////////////////////// - + // Set the document information CPDF_Dictionary* DInfoDict = pDestPDFDoc->GetInfo(); if (!DInfoDict) return FALSE; CFX_ByteString producerstr; producerstr.Format("PDFium"); - DInfoDict->SetAt("Producer", new CPDF_String(producerstr)); + DInfoDict->SetAt("Producer", new CPDF_String(producerstr, FALSE)); - // Set type//////////////////////////////////////////////////////////////// + // Set type CFX_ByteString cbRootType = pNewRoot->GetString("Type", ""); if (cbRootType.Equal("")) { pNewRoot->SetAt("Type", new CPDF_Name("Catalog")); @@ -100,7 +99,7 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc, if (!pSrcPageDict || !pCurPageDict) return FALSE; - // Clone the page dictionary/////////// + // Clone the page dictionary FX_POSITION SrcPos = pSrcPageDict->GetStartPos(); while (SrcPos) { CFX_ByteString cbSrcKeyStr; @@ -112,7 +111,7 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc, } } - // inheritable item/////////////////////// + // inheritable item CPDF_Object* pInheritable = nullptr; // 1 MediaBox //required if (!pCurPageDict->KeyExist("MediaBox")) { @@ -156,7 +155,6 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc, pCurPageDict->SetAt("Rotate", pInheritable->Clone()); } - ///////////////////////////////////////////// // Update the reference FX_DWORD dwOldPageObj = pSrcPageDict->GetObjNum(); FX_DWORD dwNewPageObj = pCurPageDict->GetObjNum(); |