| Index: fpdfsdk/cpdfsdk_xfawidgethandler.cpp
|
| diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
|
| index eb194957d0081cecf080ca5d9495f6f1fc8deedc..f4c3ba52842d93c480673536ff5971ad6deff32e 100644
|
| --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
|
| +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
|
| @@ -22,8 +22,8 @@
|
| #include "xfa/fxgraphics/cfx_graphics.h"
|
|
|
| CPDFSDK_XFAWidgetHandler::CPDFSDK_XFAWidgetHandler(
|
| - CPDFSDK_FormFillEnvironment* pEnv)
|
| - : m_pEnv(pEnv) {}
|
| + CPDFSDK_FormFillEnvironment* pFormFillEnv)
|
| + : m_pFormFillEnv(pFormFillEnv) {}
|
|
|
| CPDFSDK_XFAWidgetHandler::~CPDFSDK_XFAWidgetHandler() {}
|
|
|
| @@ -38,7 +38,7 @@ CPDFSDK_Annot* CPDFSDK_XFAWidgetHandler::NewAnnot(CPDF_Annot* pAnnot,
|
|
|
| CPDFSDK_Annot* CPDFSDK_XFAWidgetHandler::NewAnnot(CXFA_FFWidget* pAnnot,
|
| CPDFSDK_PageView* pPage) {
|
| - CPDFSDK_InterForm* pInterForm = m_pEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = m_pFormFillEnv->GetInterForm();
|
| CPDFSDK_XFAWidget* pWidget = new CPDFSDK_XFAWidget(pAnnot, pPage, pInterForm);
|
| pInterForm->AddXFAMap(pAnnot, pWidget);
|
| return pWidget;
|
| @@ -59,7 +59,7 @@ void CPDFSDK_XFAWidgetHandler::OnDraw(CPDFSDK_PageView* pPageView,
|
| mt = *pUser2Device;
|
|
|
| FX_BOOL bIsHighlight = FALSE;
|
| - if (pPageView->GetFormFillEnv()->GetSDKDocument()->GetFocusAnnot() != pAnnot)
|
| + if (pPageView->GetFormFillEnv()->GetFocusAnnot() != pAnnot)
|
| bIsHighlight = TRUE;
|
|
|
| GetXFAWidgetHandler(pAnnot)->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt,
|
| @@ -114,10 +114,10 @@ FX_BOOL CPDFSDK_XFAWidgetHandler::HitTest(CPDFSDK_PageView* pPageView,
|
| return FALSE;
|
|
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv = pPageView->GetFormFillEnv();
|
| - if (!pFormFillEnv->GetSDKDocument())
|
| + if (!pFormFillEnv)
|
| return FALSE;
|
|
|
| - CPDFXFA_Document* pDoc = pFormFillEnv->GetSDKDocument()->GetXFADocument();
|
| + CPDFXFA_Document* pDoc = pFormFillEnv->GetXFADocument();
|
| if (!pDoc)
|
| return FALSE;
|
|
|
| @@ -343,10 +343,10 @@ CXFA_FFWidgetHandler* CPDFSDK_XFAWidgetHandler::GetXFAWidgetHandler(
|
| return nullptr;
|
|
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv = pPageView->GetFormFillEnv();
|
| - if (!pFormFillEnv->GetSDKDocument())
|
| + if (!pFormFillEnv)
|
| return nullptr;
|
|
|
| - CPDFXFA_Document* pDoc = pFormFillEnv->GetSDKDocument()->GetXFADocument();
|
| + CPDFXFA_Document* pDoc = pFormFillEnv->GetXFADocument();
|
| if (!pDoc)
|
| return nullptr;
|
|
|
|
|