Index: fpdfsdk/cpdfsdk_formfillenvironment.cpp |
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp |
index 7c994727381bebce30b4bcfeb4c474f26d669e90..ec7aac9ba49bceadc5cec924cd82606f0486461d 100644 |
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp |
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp |
@@ -53,7 +53,7 @@ CPDFSDK_FormFillEnvironment::~CPDFSDK_FormFillEnvironment() { |
#ifdef PDF_ENABLE_XFA |
CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); |
- if (pProvider->m_pEnvList.GetSize() == 0) |
+ if (pProvider->m_pFormFillEnvList.GetSize() == 0) |
pProvider->SetJavaScriptInitialized(FALSE); |
#endif // PDF_ENABLE_XFA |
if (m_pInfo && m_pInfo->Release) |
@@ -582,7 +582,7 @@ CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView( |
if (!ReNew) |
return nullptr; |
- CPDFSDK_PageView* pPageView = new CPDFSDK_PageView(GetEnv(), pUnderlyingPage); |
+ CPDFSDK_PageView* pPageView = new CPDFSDK_PageView(this, pUnderlyingPage); |
m_pageMap[pUnderlyingPage] = pPageView; |
// Delay to load all the annotations, to avoid endless loop. |
pPageView->LoadFXAnnots(); |
@@ -616,7 +616,7 @@ void CPDFSDK_FormFillEnvironment::ProcJavascriptFun() { |
CPDF_Action jsAction = docJS.GetJSAction(i, csJSName); |
if (GetActionHander()) { |
GetActionHander()->DoAction_JavaScript( |
- jsAction, CFX_WideString::FromLocal(csJSName.AsStringC()), GetEnv()); |
+ jsAction, CFX_WideString::FromLocal(csJSName.AsStringC()), this); |
} |
} |
} |
@@ -642,7 +642,7 @@ FX_BOOL CPDFSDK_FormFillEnvironment::ProcOpenAction() { |
if (CPDF_Dictionary* pDict = pOpenAction->AsDictionary()) { |
CPDF_Action action(pDict); |
if (GetActionHander()) |
- GetActionHander()->DoAction_DocOpen(action, GetEnv()); |
+ GetActionHander()->DoAction_DocOpen(action, this); |
return TRUE; |
} |
return FALSE; |
@@ -683,7 +683,7 @@ UnderlyingPageType* CPDFSDK_FormFillEnvironment::GetPage(int nIndex) { |
CPDFSDK_InterForm* CPDFSDK_FormFillEnvironment::GetInterForm() { |
if (!m_pInterForm) |
- m_pInterForm = pdfium::MakeUnique<CPDFSDK_InterForm>(GetEnv()); |
+ m_pInterForm = pdfium::MakeUnique<CPDFSDK_InterForm>(this); |
return m_pInterForm.get(); |
} |