diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 15:46:10 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 15:46:10 -0400 |
| commit | 710c909117da4297e5a9508bedb306fc5c49eb36 (patch) | |
| tree | 53c9bf4471ebe72977773ec8151b4ae44c3975bb /core/src/fpdfdoc/doc_tagged.cpp | |
| parent | 316eb864137a0b8eeb0d0d4d698ba83f4946a89c (diff) | |
| download | pdfium-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/doc_tagged.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_tagged.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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, |