Merge to XFA: War on #defines, part 1.

core/src/fpdfdoc/doc_formfield.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) {
@@ skipping 282 matching lines @@
       }
       if (!pValue && m_Type != Text) {
         pValue = FPDF_GetFieldAttr(m_pDict, "DV");
       }
     }
     if (!pValue) {
       return CFX_WideString();
     }
   }
   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();
 }
 CFX_WideString CPDF_FormField::GetValue() {
   return GetValue(FALSE);
 }
 CFX_WideString CPDF_FormField::GetDefaultValue() {
   return GetValue(TRUE);
 }
 FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value,
@@ skipping 771 matching lines @@
       m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font"))
     pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(
         font_name);
 
   if (!pFontDict) {
     return;
   }
   m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
   m_FontSize = FX_atof(syntax.GetWord());
 }