From 8e5cd19d174f259bfda5f7a9699b08fdc4289b56 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jan 2016 13:20:26 -0800 Subject: Merge to XFA: War on #defines, part 1. Contains additional XFA-specific changes. Original Review URL: https://codereview.chromium.org/1632143002 . (cherry picked from commit 66a9dc9dd65ed2b9c7ede448d046b770140f16d5) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1636503006 . --- core/src/fpdfdoc/doc_formfield.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfdoc/doc_formfield.cpp') diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp index b62f8ba0b1..617acd4e99 100644 --- a/core/src/fpdfdoc/doc_formfield.cpp +++ b/core/src/fpdfdoc/doc_formfield.cpp @@ -300,14 +300,16 @@ CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault) { } } switch (pValue->GetType()) { - case PDFOBJ_STRING: - case PDFOBJ_STREAM: + case CPDF_Object::STRING: + case CPDF_Object::STREAM: return pValue->GetUnicodeText(); - case PDFOBJ_ARRAY: + case CPDF_Object::ARRAY: pValue = pValue->AsArray()->GetElementValue(0); if (pValue) return pValue->GetUnicodeText(); break; + default: + break; } return CFX_WideString(); } -- cgit v1.2.3