summaryrefslogtreecommitdiff
path: root/core/src/fpdfdoc
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-10-21 15:46:10 -0400
committerDan Sinclair <dsinclair@chromium.org>2015-10-21 15:46:10 -0400
commit710c909117da4297e5a9508bedb306fc5c49eb36 (patch)
tree53c9bf4471ebe72977773ec8151b4ae44c3975bb /core/src/fpdfdoc
parent316eb864137a0b8eeb0d0d4d698ba83f4946a89c (diff)
downloadpdfium-710c909117da4297e5a9508bedb306fc5c49eb36.tar.xz
Merge to XFA: Add type cast definitions for CPDF_Name.
This Cl adds ToName, CPDF_Object::AsName and CPDF_Object::IsName and updates the src to use them as needed. BUG=pdfium:201 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1417823005 . (cherry picked from commit 1c77edb7b34e03787605b7965784cea38ef9f1d7) Review URL: https://codereview.chromium.org/1417033004 .
Diffstat (limited to 'core/src/fpdfdoc')
-rw-r--r--core/src/fpdfdoc/doc_action.cpp2
-rw-r--r--core/src/fpdfdoc/doc_bookmark.cpp6
-rw-r--r--core/src/fpdfdoc/doc_formfield.cpp2
-rw-r--r--core/src/fpdfdoc/doc_link.cpp6
-rw-r--r--core/src/fpdfdoc/doc_tagged.cpp8
5 files changed, 12 insertions, 12 deletions
diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/src/fpdfdoc/doc_action.cpp
index c55c20cb1d..bcbfe0f112 100644
--- a/core/src/fpdfdoc/doc_action.cpp
+++ b/core/src/fpdfdoc/doc_action.cpp
@@ -17,7 +17,7 @@ CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
if (!pDest) {
return CPDF_Dest();
}
- if (pDest->IsString() || pDest->GetType() == PDFOBJ_NAME) {
+ if (pDest->IsString() || pDest->IsName()) {
CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
CFX_ByteStringC name = pDest->GetString();
return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp
index 9d2a9f61ea..6b020e5957 100644
--- a/core/src/fpdfdoc/doc_bookmark.cpp
+++ b/core/src/fpdfdoc/doc_bookmark.cpp
@@ -72,10 +72,10 @@ CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const {
return CPDF_Dest();
}
CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
- if (!pDest) {
+ if (!pDest)
return CPDF_Dest();
- }
- if (pDest->IsString() || pDest->GetType() == PDFOBJ_NAME) {
+
+ if (pDest->IsString() || pDest->IsName()) {
CPDF_NameTree name_tree(pDocument, FX_BSTRC("Dests"));
CFX_ByteStringC name = pDest->GetString();
return CPDF_Dest(name_tree.LookupNamedDest(pDocument, name));
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp
index 7e734b4e2f..0766eb0bc0 100644
--- a/core/src/fpdfdoc/doc_formfield.cpp
+++ b/core/src/fpdfdoc/doc_formfield.cpp
@@ -529,7 +529,7 @@ FX_BOOL CPDF_FormField::IsItemSelected(int index) {
}
if (pValue->IsString())
- return (pValue->GetUnicodeText() == opt_value);
+ return pValue->GetUnicodeText() == opt_value;
if (pValue->IsNumber()) {
if (pValue->GetString().IsEmpty())
diff --git a/core/src/fpdfdoc/doc_link.cpp b/core/src/fpdfdoc/doc_link.cpp
index 95411013b4..977efeafd1 100644
--- a/core/src/fpdfdoc/doc_link.cpp
+++ b/core/src/fpdfdoc/doc_link.cpp
@@ -73,10 +73,10 @@ CPDF_Rect CPDF_Link::GetRect() {
}
CPDF_Dest CPDF_Link::GetDest(CPDF_Document* pDoc) {
CPDF_Object* pDest = m_pDict->GetElementValue("Dest");
- if (pDest == NULL) {
+ if (!pDest)
return CPDF_Dest();
- }
- if (pDest->IsString() || pDest->GetType() == PDFOBJ_NAME) {
+
+ if (pDest->IsString() || pDest->IsName()) {
CPDF_NameTree name_tree(pDoc, FX_BSTRC("Dests"));
CFX_ByteStringC name = pDest->GetString();
return CPDF_Dest(name_tree.LookupNamedDest(pDoc, name));
diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp
index d9d439f730..ac29d90118 100644
--- a/core/src/fpdfdoc/doc_tagged.cpp
+++ b/core/src/fpdfdoc/doc_tagged.cpp
@@ -417,11 +417,11 @@ CFX_ByteString CPDF_StructElementImpl::GetName(
FX_BOOL bInheritable,
int subindex) {
CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
- if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NAME) {
- return default_value;
- }
- return pAttr->GetString();
+ if (ToName(pAttr))
+ return pAttr->GetString();
+ return default_value;
}
+
FX_ARGB CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner,
const CFX_ByteStringC& name,
FX_ARGB default_value,