From d0409afc6a994a3e24043b8a96c83c022bcaa189 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 25 May 2017 15:53:57 -0700 Subject: Mass conversion of remaining class members (non-xfa) Change-Id: I8365ba80e3395d59a3cf35dbd9d9162e86e712e3 Reviewed-on: https://pdfium-review.googlesource.com/5970 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- fpdfsdk/fpdfdoc_unittest.cpp | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'fpdfsdk/fpdfdoc_unittest.cpp') diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index 449121d351..6409f70fe2 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -87,7 +87,7 @@ class PDFDocTest : public testing::Test { protected: std::unique_ptr m_pDoc; - CPDF_IndirectObjectHolder* m_pIndirectObjs; + CFX_UnownedPtr m_pIndirectObjs; std::unique_ptr m_pRootObj; }; @@ -116,25 +116,25 @@ TEST_F(PDFDocTest, FindBookmark) { auto bookmarks = CreateDictObjs(3); bookmarks[1].obj->SetNewFor("Title", L"Chapter 1"); - bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[1].obj->SetNewFor("Next", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("Next", m_pIndirectObjs.Get(), bookmarks[2].num); bookmarks[2].obj->SetNewFor("Title", L"Chapter 2"); - bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[2].obj->SetNewFor("Prev", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("Prev", m_pIndirectObjs.Get(), bookmarks[1].num); bookmarks[0].obj->SetNewFor("Type", "Outlines"); bookmarks[0].obj->SetNewFor("Count", 2); - bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs.Get(), bookmarks[1].num); - bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs.Get(), bookmarks[2].num); - m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs, + m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs.Get(), bookmarks[0].num); // Title with no match. @@ -159,25 +159,25 @@ TEST_F(PDFDocTest, FindBookmark) { auto bookmarks = CreateDictObjs(3); bookmarks[1].obj->SetNewFor("Title", L"Chapter 1"); - bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[1].obj->SetNewFor("First", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("First", m_pIndirectObjs.Get(), bookmarks[2].num); bookmarks[2].obj->SetNewFor("Title", L"Chapter 2"); - bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[1].num); - bookmarks[2].obj->SetNewFor("First", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("First", m_pIndirectObjs.Get(), bookmarks[1].num); bookmarks[0].obj->SetNewFor("Type", "Outlines"); bookmarks[0].obj->SetNewFor("Count", 2); - bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs.Get(), bookmarks[1].num); - bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs.Get(), bookmarks[2].num); - m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs, + m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs.Get(), bookmarks[0].num); // Title with no match. @@ -194,31 +194,31 @@ TEST_F(PDFDocTest, FindBookmark) { auto bookmarks = CreateDictObjs(4); bookmarks[1].obj->SetNewFor("Title", L"Chapter 1"); - bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[1].obj->SetNewFor("Next", m_pIndirectObjs, + bookmarks[1].obj->SetNewFor("Next", m_pIndirectObjs.Get(), bookmarks[2].num); bookmarks[2].obj->SetNewFor("Title", L"Chapter 2"); - bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[2].obj->SetNewFor("Next", m_pIndirectObjs, + bookmarks[2].obj->SetNewFor("Next", m_pIndirectObjs.Get(), bookmarks[3].num); bookmarks[3].obj->SetNewFor("Title", L"Chapter 3"); - bookmarks[3].obj->SetNewFor("Parent", m_pIndirectObjs, + bookmarks[3].obj->SetNewFor("Parent", m_pIndirectObjs.Get(), bookmarks[0].num); - bookmarks[3].obj->SetNewFor("Next", m_pIndirectObjs, + bookmarks[3].obj->SetNewFor("Next", m_pIndirectObjs.Get(), bookmarks[1].num); bookmarks[0].obj->SetNewFor("Type", "Outlines"); bookmarks[0].obj->SetNewFor("Count", 2); - bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("First", m_pIndirectObjs.Get(), bookmarks[1].num); - bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs, + bookmarks[0].obj->SetNewFor("Last", m_pIndirectObjs.Get(), bookmarks[2].num); - m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs, + m_pRootObj->SetNewFor("Outlines", m_pIndirectObjs.Get(), bookmarks[0].num); // Title with no match. -- cgit v1.2.3