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

fpdfsdk/src/fpdfxfa/fpdfxfa_doc.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 "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h"
@@ skipping 630 matching lines @@
       return;
     CPDF_Dictionary* pRoot = m_pPDFDoc->GetRoot();
     if (pRoot == NULL)
       return;
     CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
     if (NULL == pAcroForm)
       return;
     CPDF_Object* pXFA = pAcroForm->GetElement("XFA");
     if (pXFA == NULL)
       return;
-    if (pXFA->GetType() != PDFOBJ_ARRAY)
+    if (!pXFA->IsArray())
       return;
     CPDF_Array* pArray = pXFA->GetArray();
     if (NULL == pArray)
       return;
     int size = pArray->GetCount();
     for (int i = 1; i < size; i += 2) {
       CPDF_Object* pPDFObj = pArray->GetElement(i);
       CPDF_Object* pPrePDFObj = pArray->GetElement(i - 1);
-      if (pPrePDFObj->GetType() != PDFOBJ_STRING)
+      if (!pPrePDFObj->IsString())
         continue;
-      if (pPDFObj->GetType() != PDFOBJ_REFERENCE)
+      if (!pPDFObj->IsReference())
         continue;
       CPDF_Object* pDirectObj = pPDFObj->GetDirect();
-      if (pDirectObj->GetType() != PDFOBJ_STREAM)
+      if (!pDirectObj->IsStream())
         continue;
       if (pPrePDFObj->GetString() == "form") {
         CFX_WideStringC form(L"form");
         pXFADocHander->SavePackage(m_pXFADocView->GetDoc(), form, &fileWrite);
       } else if (pPrePDFObj->GetString() == "datasets") {
         CFX_WideStringC datasets(L"datasets");
         pXFADocHander->SavePackage(m_pXFADocView->GetDoc(), datasets,
                                    &fileWrite);
       } else {
         if (i == size - 1) {
@@ skipping 282 matching lines @@
     CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
     if (NULL == pAcroForm) {
       fileStream.Flush();
       return FALSE;
     }
     CPDF_Object* pXFA = pAcroForm->GetElement("XFA");
     if (pXFA == NULL) {
       fileStream.Flush();
       return FALSE;
     }
-    if (pXFA->GetType() != PDFOBJ_ARRAY) {
+    if (!pXFA->IsArray()) {
       fileStream.Flush();
       return FALSE;
     }
     CPDF_Array* pArray = pXFA->GetArray();
     if (NULL == pArray) {
       fileStream.Flush();
       return FALSE;
     }
     int size = pArray->GetCount();
     for (int i = 1; i < size; i += 2) {
       CPDF_Object* pPDFObj = pArray->GetElement(i);
       CPDF_Object* pPrePDFObj = pArray->GetElement(i - 1);
-      if (pPrePDFObj->GetType() != PDFOBJ_STRING)
+      if (!pPrePDFObj->IsString())
         continue;
-      if (pPDFObj->GetType() != PDFOBJ_REFERENCE)
+      if (!pPDFObj->IsReference())
         continue;
       CPDF_Object* pDirectObj = pPDFObj->GetDirect();
-      if (pDirectObj->GetType() != PDFOBJ_STREAM)
+      if (!pDirectObj->IsStream())
         continue;
       if (pPrePDFObj->GetString() == "config" && !(flag & FXFA_CONFIG))
         continue;
       if (pPrePDFObj->GetString() == "template" && !(flag & FXFA_TEMPLATE))
         continue;
       if (pPrePDFObj->GetString() == "localeSet" && !(flag & FXFA_LOCALESET))
         continue;
       if (pPrePDFObj->GetString() == "datasets" && !(flag & FXFA_DATASETS))
         continue;
       if (pPrePDFObj->GetString() == "xmpmeta" && !(flag & FXFA_XMPMETA))
@@ skipping 267 matching lines @@
   }
 
   return _GetHValueByName(szPropName, hValue,
                           m_pSDKDoc->GetEnv()->GetJSRuntime());
 }
 FX_BOOL CPDFXFA_Document::_GetHValueByName(const CFX_ByteStringC& utf8Name,
                                            FXJSE_HVALUE hValue,
                                            IJS_Runtime* runTime) {
   return runTime->GetHValueByName(utf8Name, hValue);
 }