From df4bc596c64fb848647c670be66a29ea0861b4f4 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 31 Mar 2016 20:34:43 -0700 Subject: Remove IXFA_* interfaces. This CL removes the IXFA_* interfaces which are: - Implemented once. - Not implemented by an fpdfsdk class. This requires making a few classes visible to fpdfsdk so we can have the correct instances available instead of the IXFA types. Review URL: https://codereview.chromium.org/1846993002 --- fpdfsdk/fpdfsave.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/fpdfsave.cpp') diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index e11e1f2d6d..b9d393e505 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -23,6 +23,10 @@ #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" +#include "xfa/include/fxfa/xfa_checksum.h" +#include "xfa/include/fxfa/xfa_ffapp.h" +#include "xfa/include/fxfa/xfa_ffdocview.h" +#include "xfa/include/fxfa/xfa_ffwidgethandler.h" #endif #if _FX_OS_ == _FX_ANDROID_ @@ -83,11 +87,11 @@ bool SaveXFADocumentData(CPDFXFA_Document* pDocument, if (!CPDFXFA_App::GetInstance()->GetXFAApp()) return true; - IXFA_DocView* pXFADocView = pDocument->GetXFADocView(); + CXFA_FFDocView* pXFADocView = pDocument->GetXFADocView(); if (!pXFADocView) return true; - IXFA_DocHandler* pXFADocHandler = + CXFA_FFDocHandler* pXFADocHandler = CPDFXFA_App::GetInstance()->GetXFAApp()->GetDocHandler(); CPDF_Document* pPDFDocument = pDocument->GetPDFDoc(); if (!pDocument) @@ -128,8 +132,8 @@ bool SaveXFADocumentData(CPDFXFA_Document* pDocument, else if (pPDFObj->GetString() == "template") iTemplate = i + 1; } - std::unique_ptr> - pContext(XFA_Checksum_Create()); + std::unique_ptr> + pContext(new CXFA_ChecksumContext); pContext->StartChecksum(); // template @@ -228,13 +232,13 @@ bool SendPostSaveToXFADoc(CPDFXFA_Document* pDocument) { pDocument->GetDocType() != DOCTYPE_STATIC_XFA) return true; - IXFA_DocView* pXFADocView = pDocument->GetXFADocView(); + CXFA_FFDocView* pXFADocView = pDocument->GetXFADocView(); if (!pXFADocView) return false; - IXFA_WidgetHandler* pWidgetHander = pXFADocView->GetWidgetHandler(); + CXFA_FFWidgetHandler* pWidgetHander = pXFADocView->GetWidgetHandler(); CXFA_WidgetAcc* pWidgetAcc = NULL; - IXFA_WidgetAccIterator* pWidgetAccIterator = + CXFA_WidgetAccIterator* pWidgetAccIterator = pXFADocView->CreateWidgetAccIterator(); pWidgetAcc = pWidgetAccIterator->MoveToNext(); while (pWidgetAcc) { @@ -255,13 +259,13 @@ bool SendPreSaveToXFADoc(CPDFXFA_Document* pDocument, pDocument->GetDocType() != DOCTYPE_STATIC_XFA) return true; - IXFA_DocView* pXFADocView = pDocument->GetXFADocView(); + CXFA_FFDocView* pXFADocView = pDocument->GetXFADocView(); if (!pXFADocView) return true; - IXFA_WidgetHandler* pWidgetHander = pXFADocView->GetWidgetHandler(); + CXFA_FFWidgetHandler* pWidgetHander = pXFADocView->GetWidgetHandler(); CXFA_WidgetAcc* pWidgetAcc = NULL; - IXFA_WidgetAccIterator* pWidgetAccIterator = + CXFA_WidgetAccIterator* pWidgetAccIterator = pXFADocView->CreateWidgetAccIterator(); pWidgetAcc = pWidgetAccIterator->MoveToNext(); while (pWidgetAcc) { -- cgit v1.2.3