From 316eb864137a0b8eeb0d0d4d698ba83f4946a89c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 21 Oct 2015 13:29:23 -0400 Subject: 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 . --- fpdfsdk/src/fsdk_baseform.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/src/fsdk_baseform.cpp') diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index d7374a6f18..68c320b4af 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -2747,10 +2747,9 @@ void CPDFSDK_InterForm::DoFDFBuffer(CFX_ByteString sBuffer) { CPDF_Object* pJS = pJSDict->GetElementValue("Before"); if (pJS != NULL) { - int iType = pJS->GetType(); - if (iType == PDFOBJ_STRING) + if (pJS->IsString()) csJS = pJSDict->GetUnicodeText("Before"); - else if (iType == PDFOBJ_STREAM) + else if (pJS->GetType() == PDFOBJ_STREAM) csJS = pJS->GetUnicodeText(); } } @@ -2939,13 +2938,12 @@ void CPDFSDK_InterForm::GetFieldFromObjects(const CFX_PtrArray& objects, if (pObject == NULL) continue; - int iType = pObject->GetType(); - if (iType == PDFOBJ_STRING) { + if (pObject->IsString()) { CFX_WideString csName = pObject->GetUnicodeText(); CPDF_FormField* pField = m_pInterForm->GetField(0, csName); if (pField != NULL) fields.Add(pField); - } else if (iType == PDFOBJ_DICTIONARY) { + } else if (pObject->IsDictionary()) { if (m_pInterForm->IsValidFormField(pObject)) fields.Add(pObject); } -- cgit v1.2.3