diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:29:23 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:29:23 -0400 |
| commit | 316eb864137a0b8eeb0d0d4d698ba83f4946a89c (patch) | |
| tree | 9268f9369d9382ca3ee8f7496ab71394dfa9daef /core/src/fpdfdoc/doc_bookmark.cpp | |
| parent | 43ce9035a026c7b4f15aa938dc39444d9253ea9f (diff) | |
| download | pdfium-316eb864137a0b8eeb0d0d4d698ba83f4946a89c.tar.xz | |
Merge to XFA: Add type cast definitions for CPDF_String.
This Cl adds ToString, CPDF_Object::AsString and CPDF_Object::IsString and
updates the src to use them as needed.
BUG=pdfium:201
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1417933002 .
(cherry picked from commit 53d3ab125ef583be8cfac907b308a6551b93067a)
Review URL: https://codereview.chromium.org/1408323006 .
Diffstat (limited to 'core/src/fpdfdoc/doc_bookmark.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_bookmark.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp index 2fea810ecc..9d2a9f61ea 100644 --- a/core/src/fpdfdoc/doc_bookmark.cpp +++ b/core/src/fpdfdoc/doc_bookmark.cpp @@ -51,10 +51,10 @@ CFX_WideString CPDF_Bookmark::GetTitle() const { if (!m_pDict) { return CFX_WideString(); } - CPDF_String* pString = (CPDF_String*)m_pDict->GetElementValue("Title"); - if (!pString || pString->GetType() != PDFOBJ_STRING) { + CPDF_String* pString = ToString(m_pDict->GetElementValue("Title")); + if (!pString) return CFX_WideString(); - } + CFX_WideString title = pString->GetUnicodeText(); int len = title.GetLength(); if (!len) { @@ -75,7 +75,7 @@ CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const { if (!pDest) { return CPDF_Dest(); } - if (pDest->GetType() == PDFOBJ_STRING || pDest->GetType() == PDFOBJ_NAME) { + if (pDest->IsString() || pDest->GetType() == PDFOBJ_NAME) { CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests")); CFX_ByteStringC name = pDest->GetString(); return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name)); |