Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

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"
 
+#ifdef PDF_ENABLE_XFA
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
+#endif
 #include "fpdfsdk/include/fsdk_define.h"
 #include "public/fpdf_edit.h"
+#ifdef PDF_ENABLE_XFA
 #include "public/fpdf_formfill.h"
+#endif
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
 #else
 #include <ctime>
 #endif
 
 class CFX_IFileWrite final : public IFX_StreamWrite {
  public:
   CFX_IFileWrite();
@@ skipping 24 matching lines @@
     return FALSE;
 
   m_pFileWriteStruct->WriteBlock(m_pFileWriteStruct, pData, size);
   return TRUE;
 }
 
 void CFX_IFileWrite::Release() {
   delete this;
 }
 
+#ifdef PDF_ENABLE_XFA
 #define XFA_DATASETS 0
 #define XFA_FORMS 1
 
 FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument,
                              CFX_PtrArray& fileList) {
 #ifdef PDF_ENABLE_XFA
   if (!pDocument)
     return FALSE;
   if (pDocument->GetDocType() != DOCTYPE_DYNIMIC_XFA &&
       pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
@@ skipping 203 matching lines @@
     CXFA_EventParam preParam;
     preParam.m_eType = XFA_EVENT_PreSave;
     pWidgetHander->ProcessEvent(pWidgetAcc, &preParam);
     pWidgetAcc = pWidgetAccIterator->MoveToNext();
   }
   pWidgetAccIterator->Release();
   pXFADocView->UpdateDocView();
   return _SaveXFADocumentData(pDocument, fileList);
 }
 
+#endif
 FPDF_BOOL _FPDF_Doc_Save(FPDF_DOCUMENT document,
                          FPDF_FILEWRITE* pFileWrite,
                          FPDF_DWORD flags,
                          FPDF_BOOL bSetVersion,
                          int fileVerion) {
+#ifndef PDF_ENABLE_XFA
+  CPDF_Document* pDoc = CPDFDocumentFromFPDFDocument(document);
+  if (!pDoc)
+#else
   CPDFXFA_Document* pDoc = (CPDFXFA_Document*)document;

[Lei Zhang, 2015/11/25 00:12:02]

Maybe more UnderlyingDocumentType here?

 
   CFX_PtrArray fileList;
 
   _SendPreSaveToXFADoc(pDoc, fileList);
 
   CPDF_Document* pPDFDoc = pDoc->GetPDFDoc();
   if (!pPDFDoc)
+#endif
     return 0;
 
   if (flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY) {
     flags = 0;
   }
 
+#ifndef PDF_ENABLE_XFA
+  CPDF_Creator FileMaker(pDoc);
+#else
   CPDF_Creator FileMaker(pPDFDoc);
+#endif
   if (bSetVersion)
     FileMaker.SetFileVersion(fileVerion);
   if (flags == FPDF_REMOVE_SECURITY) {
     flags = 0;
     FileMaker.RemoveSecurity();
   }
   CFX_IFileWrite* pStreamWrite = NULL;
   FX_BOOL bRet;
   pStreamWrite = new CFX_IFileWrite;
   pStreamWrite->Init(pFileWrite);
   bRet = FileMaker.Create(pStreamWrite, flags);
+#ifdef PDF_ENABLE_XFA
 
   _SendPostSaveToXFADoc(pDoc);
 
   for (int i = 0; i < fileList.GetSize(); i++) {
     IFX_FileStream* pFile = (IFX_FileStream*)fileList.GetAt(i);
     pFile->Release();
   }
   fileList.RemoveAll();
 
+#endif
   pStreamWrite->Release();
   return bRet;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_SaveAsCopy(FPDF_DOCUMENT document,
                                             FPDF_FILEWRITE* pFileWrite,
                                             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);
 }