From 655fccab2f80af3a0e160116f30796e2da77f919 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 11 Oct 2016 13:53:37 -0700 Subject: Convert CPDFXFA_Document to use CPDFSDK_FormFillEnvironment This CL removes the use of CPDFSDK_Document from CPDFXFA_Document. Review-Url: https://codereview.chromium.org/2396213002 --- fpdfsdk/fpdfformfill.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/fpdfformfill.cpp') diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 184f7ca341..8146e1df42 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -253,15 +253,15 @@ FPDFDOC_InitFormFillEnvironment(FPDF_DOCUMENT document, // If the CPDFXFA_Document has a SDKDocument already then we've done this // and can just return the old Env. Otherwise, we'll end up setting a new // SDKDocument into the XFADocument and, that could get weird. - if (pDocument->GetSDKDoc()) - return pDocument->GetSDKDoc()->GetEnv(); + if (pDocument->GetFormFillEnv()) + return pDocument->GetFormFillEnv(); #endif CPDFSDK_FormFillEnvironment* pFormFillEnv = new CPDFSDK_FormFillEnvironment(pDocument, formInfo); #ifdef PDF_ENABLE_XFA - pDocument->SetSDKDoc(pFormFillEnv->GetSDKDocument()); + pDocument->SetFormFillEnv(pFormFillEnv); CPDFXFA_App::GetInstance()->AddFormFillEnv(pFormFillEnv); #endif // PDF_ENABLE_XFA @@ -285,7 +285,7 @@ FPDFDOC_ExitFormFillEnvironment(FPDF_FORMHANDLE hHandle) { // If the document was closed first, it's possible the XFA document // is now a nullptr. if (pFormFillEnv->GetSDKDocument()->GetXFADocument()) - pFormFillEnv->GetSDKDocument()->GetXFADocument()->SetSDKDoc(nullptr); + pFormFillEnv->GetSDKDocument()->GetXFADocument()->SetFormFillEnv(nullptr); #endif // PDF_ENABLE_XFA delete pFormFillEnv; -- cgit v1.2.3