diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-06 10:52:05 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-06 10:52:05 -0800 |
| commit | ac8d1e75645d783cc72d2cfd57554e48e3ed2999 (patch) | |
| tree | f9a81ec2955e3510e2f5000951770b56abb7194a /core/src/fpdfdoc/doc_bookmark.cpp | |
| parent | 934c277e262e1402a87581ab7dcef4a7733ddf08 (diff) | |
| download | pdfium-ac8d1e75645d783cc72d2cfd57554e48e3ed2999.tar.xz | |
Merge to XFA: Make conversion between CPDF_Dest and its object explicit.
Original Review URL: https://codereview.chromium.org/984703004
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/984143002
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 { |