Make CPDFXFA_App / IXFA_AppProvider saner

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_edit.h"
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_save.h"
 #include "../include/fsdk_define.h"
@@ skipping 49 matching lines @@
 
 #define  XFA_DATASETS 0
 #define  XFA_FORMS    1
 
 FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument, CFX_PtrArray& fileList)
 {
         if (!pDocument)
                 return FALSE;
         if (pDocument->GetDocType() != DOCTYPE_DYNIMIC_XFA && pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
                 return TRUE;
-        if (!FPDFXFA_GetApp()->GetXFAApp())
+        if (!CPDFXFA_App::GetInstance()->GetXFAApp())
                 return TRUE;
 
         IXFA_DocView* pXFADocView = pDocument->GetXFADocView();
         if (NULL == pXFADocView)
                 return TRUE;
-        IXFA_DocHandler *pXFADocHandler = FPDFXFA_GetApp()->GetXFAApp()->GetDocHandler();
-        
+
+        IXFA_DocHandler *pXFADocHandler = CPDFXFA_App::GetInstance()->GetXFAApp()->GetDocHandler();
         CPDF_Document * pPDFDocument = pDocument->GetPDFDoc();
-        if (pDocument == NULL) 
+        if (pDocument == NULL)
                 return FALSE;
+
         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)
@@ skipping 259 matching lines @@
 {
         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);
 }