From dc8a2b7606c2c6c12d5cfb280dfb49128c1a60ab Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 24 May 2017 13:45:11 -0700 Subject: Convert to CFX_UnownedPtr, part 10 Change-Id: I4eab5e843580845753c5f80c05cf9490a85114b6 Reviewed-on: https://pdfium-review.googlesource.com/5890 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- fpdfsdk/fpdfppo.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/fpdfppo.cpp') diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index e2ef406b05..d05fab9c0b 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -18,6 +18,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" +#include "core/fxcrt/cfx_unowned_ptr.h" #include "fpdfsdk/fsdk_define.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" @@ -137,8 +138,8 @@ class CPDF_PageOrganizer { bool UpdateReference(CPDF_Object* pObj, ObjectNumberMap* pObjNumberMap); uint32_t GetNewObjId(ObjectNumberMap* pObjNumberMap, CPDF_Reference* pRef); - CPDF_Document* m_pDestPDFDoc; - CPDF_Document* m_pSrcPDFDoc; + CFX_UnownedPtr m_pDestPDFDoc; + CFX_UnownedPtr m_pSrcPDFDoc; }; CPDF_PageOrganizer::CPDF_PageOrganizer(CPDF_Document* pDestPDFDoc, @@ -170,7 +171,7 @@ bool CPDF_PageOrganizer::PDFDocInit() { pElement ? ToDictionary(pElement->GetDirect()) : nullptr; if (!pNewPages) { pNewPages = m_pDestPDFDoc->NewIndirect(); - pNewRoot->SetNewFor("Pages", m_pDestPDFDoc, + pNewRoot->SetNewFor("Pages", m_pDestPDFDoc.Get(), pNewPages->GetObjNum()); } @@ -181,7 +182,7 @@ bool CPDF_PageOrganizer::PDFDocInit() { if (!pNewPages->GetArrayFor("Kids")) { pNewPages->SetNewFor("Count", 0); pNewPages->SetNewFor( - "Kids", m_pDestPDFDoc, + "Kids", m_pDestPDFDoc.Get(), m_pDestPDFDoc->NewIndirect()->GetObjNum()); } @@ -260,7 +261,7 @@ bool CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj, uint32_t newobjnum = GetNewObjId(pObjNumberMap, pReference); if (newobjnum == 0) return false; - pReference->SetRef(m_pDestPDFDoc, newobjnum); + pReference->SetRef(m_pDestPDFDoc.Get(), newobjnum); break; } case CPDF_Object::DICTIONARY: { -- cgit v1.2.3