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

core/src/fpdfdoc/doc_formfield.cpp

Index: core/src/fpdfdoc/doc_formfield.cpp
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp
index b62f8ba0b1837a68e6603d3b22d3971184840426..617acd4e993c82ba59738bce9be1accb114d6b43 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();
 }