diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-03-06 10:34:48 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-03-06 10:34:48 -0800 |
commit | 5a370d77d0db7550e91888f0ff50ee305f0f9f3d (patch) | |
tree | 8904d0b898864938c5ad8b4eb26c0ae9fbcb21b4 /core/src/fpdfdoc/doc_bookmark.cpp | |
parent | 7348faecc70ca3bff5aa3715da32032f0c897c23 (diff) | |
download | pdfium-5a370d77d0db7550e91888f0ff50ee305f0f9f3d.tar.xz |
Make conversion between CPDF_Dest and its object explicit.
Precursor to taking a second shot at cleaning up the FPDF_*
APIs. A FPDF_Dest is a CPDF_Array, and a CPDF_Dest
is a structure holding a FPDF_Dest. This goes against the
convention that FPDF_ types get cast to CPDF_* types, so we
want to make it clear where objects are getting constructed,
etc.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/984703004
Diffstat (limited to 'core/src/fpdfdoc/doc_bookmark.cpp')
-rw-r--r-- | core/src/fpdfdoc/doc_bookmark.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp index a3a194337e..9814de61bf 100644 --- a/core/src/fpdfdoc/doc_bookmark.cpp +++ b/core/src/fpdfdoc/doc_bookmark.cpp @@ -68,20 +68,21 @@ CFX_WideString CPDF_Bookmark::GetTitle() const CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const { if (!m_pDict) { - return NULL; + return CPDF_Dest(); } CPDF_Object* pDest = m_pDict->GetElementValue("Dest"); if (!pDest) { - return NULL; + return CPDF_Dest(); } if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) { CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests")); CFX_ByteStringC name = pDest->GetString(); - return name_tree.LookupNamedDest(pDocument, name); - } else if (pDest->GetType() == PDFOBJ_ARRAY) { - return (CPDF_Array*)pDest; + return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name)); } - return NULL; + if (pDest->GetType() == PDFOBJ_ARRAY) { + return CPDF_Dest((CPDF_Array*)pDest); + } + return CPDF_Dest(); } CPDF_Action CPDF_Bookmark::GetAction() const { |