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

fpdfsdk/src/fpdfsave.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 "public/fpdf_save.h"
 
 #include "core/include/fpdfapi/fpdf_serial.h"
 #include "fpdfsdk/include/fsdk_define.h"
@@ skipping 75 matching lines @@
 
   CPDF_Dictionary* pRoot = pPDFDocument->GetRoot();
   if (pRoot == NULL)
     return FALSE;
   CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
   if (NULL == pAcroForm)
     return FALSE;
   CPDF_Object* pXFA = pAcroForm->GetElement("XFA");
   if (pXFA == NULL)
     return TRUE;
-  if (pXFA->GetType() != PDFOBJ_ARRAY)
+  if (!pXFA->IsArray())
     return FALSE;
   CPDF_Array* pArray = pXFA->GetArray();
   if (NULL == pArray)
     return FALSE;
   int size = pArray->GetCount();
   int iFormIndex = -1;
   int iDataSetsIndex = -1;
   int iTemplate = -1;
   int iLast = size - 2;
   for (int i = 0; i < size - 1; i++) {
     CPDF_Object* pPDFObj = pArray->GetElement(i);
-    if (pPDFObj->GetType() != PDFOBJ_STRING)
+    if (!pPDFObj->IsString())
       continue;
     if (pPDFObj->GetString() == "form")
       iFormIndex = i + 1;
     else if (pPDFObj->GetString() == "datasets")
       iDataSetsIndex = i + 1;
     else if (pPDFObj->GetString() == "template")
       iTemplate = i + 1;
   }
   IXFA_ChecksumContext* pContext = NULL;
   // Checksum
@@ skipping 10 matching lines @@
     FX_DWORD dwSize2 = streamAcc.GetSize();
     IFX_FileStream* pTemplate = FX_CreateMemoryStream(pData, dwSize2);
     pContext->UpdateChecksum((IFX_FileRead*)pTemplate);
     pTemplate->Release();
   }
   CPDF_Stream* pFormStream = NULL;
   CPDF_Stream* pDataSetsStream = NULL;
   if (iFormIndex != -1) {
     // Get form CPDF_Stream
     CPDF_Object* pFormPDFObj = pArray->GetElement(iFormIndex);
-    if (pFormPDFObj->GetType() == PDFOBJ_REFERENCE) {
-      CPDF_Object* pFormDircetObj = pFormPDFObj->GetDirect();
-      if (NULL != pFormDircetObj &&
-          pFormDircetObj->GetType() == PDFOBJ_STREAM) {
-        pFormStream = (CPDF_Stream*)pFormDircetObj;
+    if (pFormPDFObj->IsReference()) {
+      CPDF_Object* pFormDirectObj = pFormPDFObj->GetDirect();
+      if (pFormDirectObj && pFormDirectObj->IsStream()) {
+        pFormStream = (CPDF_Stream*)pFormDirectObj;
       }
-    } else if (pFormPDFObj->GetType() == PDFOBJ_STREAM) {
+    } else if (pFormPDFObj->IsStream()) {
       pFormStream = (CPDF_Stream*)pFormPDFObj;
     }
   }
 
   if (iDataSetsIndex != -1) {
     // Get datasets CPDF_Stream
     CPDF_Object* pDataSetsPDFObj = pArray->GetElement(iDataSetsIndex);
-    if (pDataSetsPDFObj->GetType() == PDFOBJ_REFERENCE) {
+    if (pDataSetsPDFObj->IsReference()) {
       CPDF_Reference* pDataSetsRefObj = (CPDF_Reference*)pDataSetsPDFObj;
-      CPDF_Object* pDataSetsDircetObj = pDataSetsRefObj->GetDirect();
-      if (NULL != pDataSetsDircetObj &&
-          pDataSetsDircetObj->GetType() == PDFOBJ_STREAM) {
-        pDataSetsStream = (CPDF_Stream*)pDataSetsDircetObj;
+      CPDF_Object* pDataSetsDirectObj = pDataSetsRefObj->GetDirect();
+      if (pDataSetsDirectObj && pDataSetsDirectObj->IsStream()) {
+        pDataSetsStream = (CPDF_Stream*)pDataSetsDirectObj;
       }
-    } else if (pDataSetsPDFObj->GetType() == PDFOBJ_STREAM) {
+    } else if (pDataSetsPDFObj->IsStream()) {
       pDataSetsStream = (CPDF_Stream*)pDataSetsPDFObj;
     }
   }
   // end
   // L"datasets"
   {
     IFX_FileStream* pDsfileWrite = FX_CreateMemoryStream();
     if (NULL == pDsfileWrite) {
       pContext->Release();
       pDsfileWrite->Release();
@@ skipping 155 matching lines @@
                                             FPDF_DWORD flags) {
   return _FPDF_Doc_Save(document, pFileWrite, flags, FALSE, 0);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveWithVersion(FPDF_DOCUMENT document,
                                                  FPDF_FILEWRITE* pFileWrite,
                                                  FPDF_DWORD flags,
                                                  int fileVersion) {
   return _FPDF_Doc_Save(document, pFileWrite, flags, TRUE, fileVersion);
 }