Cleanup the FF Handler proxy methods.

fpdfsdk/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 <vector>
 
@@ skipping 73 matching lines @@
       pDocument->GetDocType() != DOCTYPE_STATIC_XFA)
     return true;
 
   if (!CPDFXFA_App::GetInstance()->GetXFAApp())
     return true;
 
   CXFA_FFDocView* pXFADocView = pDocument->GetXFADocView();
   if (!pXFADocView)
     return true;
 
-  CXFA_FFDocHandler* pXFADocHandler =
-      CPDFXFA_App::GetInstance()->GetXFAApp()->GetDocHandler();
   CPDF_Document* pPDFDocument = pDocument->GetPDFDoc();
   if (!pDocument)
     return false;
 
   CPDF_Dictionary* pRoot = pPDFDocument->GetRoot();
   if (!pRoot)
     return false;
 
   CPDF_Dictionary* pAcroForm = pRoot->GetDictBy("AcroForm");
   if (!pAcroForm)
@@ skipping 64 matching lines @@
       if (pDataSetsDirectObj && pDataSetsDirectObj->IsStream()) {
         pDataSetsStream = (CPDF_Stream*)pDataSetsDirectObj;
       }
     } else if (pDataSetsPDFObj->IsStream()) {
       pDataSetsStream = (CPDF_Stream*)pDataSetsPDFObj;
     }
   }
   // L"datasets"
   {
     ScopedFileStream pDsfileWrite(FX_CreateMemoryStream());
-    if (pXFADocHandler->SavePackage(pXFADocView->GetDoc(),
-                                    CFX_WideStringC(L"datasets"),
-                                    pDsfileWrite.get()) &&
+    if (pXFADocView->GetDoc()->SavePackage(CFX_WideStringC(L"datasets"),
+                                           pDsfileWrite.get()) &&
         pDsfileWrite->GetSize() > 0) {
       // Datasets
       pContext->UpdateChecksum(pDsfileWrite.get());
       pContext->FinishChecksum();
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iDataSetsIndex != -1) {
         if (pDataSetsStream)
           pDataSetsStream->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL);
         pData->InitStreamFromFile(pDsfileWrite.get(), pDataDict);
         pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
         pArray->InsertAt(iLast, new CPDF_String("datasets", FALSE));
         pArray->InsertAt(iLast + 1, pData, pPDFDocument);
       }
       fileList->push_back(std::move(pDsfileWrite));
     }
   }
   // L"form"
   {
     ScopedFileStream pfileWrite(FX_CreateMemoryStream());
-    if (pXFADocHandler->SavePackage(pXFADocView->GetDoc(),
-                                    CFX_WideStringC(L"form"), pfileWrite.get(),
-                                    pContext.get()) &&
+    if (pXFADocView->GetDoc()->SavePackage(CFX_WideStringC(L"form"),
+                                           pfileWrite.get(), pContext.get()) &&
         pfileWrite->GetSize() > 0) {
       CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
       if (iFormIndex != -1) {
         if (pFormStream)
           pFormStream->InitStreamFromFile(pfileWrite.get(), pDataDict);
       } else {
         CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL);
         pData->InitStreamFromFile(pfileWrite.get(), pDataDict);
         pPDFDocument->AddIndirectObject(pData);
         iLast = pArray->GetCount() - 2;
@@ skipping 106 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);
 }