| Index: fpdfsdk/cpdfsdk_annothandlermgr.cpp
|
| diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
|
| index 6401db8392635165805c6680836257103972df20..3d39c5d39aa01af8dbd565cc3f3f6af5ca4d6f2a 100644
|
| --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
|
| +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
|
| @@ -24,14 +24,14 @@
|
| #endif // PDF_ENABLE_XFA
|
|
|
| CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(
|
| - CPDFSDK_FormFillEnvironment* pEnv)
|
| + CPDFSDK_FormFillEnvironment* pFormFillEnv)
|
| : m_pBAAnnotHandler(new CPDFSDK_BAAnnotHandler()),
|
| - m_pWidgetHandler(new CPDFSDK_WidgetHandler(pEnv)),
|
| + m_pWidgetHandler(new CPDFSDK_WidgetHandler(pFormFillEnv)),
|
| #ifdef PDF_ENABLE_XFA
|
| - m_pXFAWidgetHandler(new CPDFSDK_XFAWidgetHandler(pEnv)),
|
| + m_pXFAWidgetHandler(new CPDFSDK_XFAWidgetHandler(pFormFillEnv)),
|
| #endif // PDF_ENABLE_XFA
|
| - m_pEnv(pEnv) {
|
| - m_pWidgetHandler->SetFormFiller(m_pEnv->GetInteractiveFormFiller());
|
| + m_pFormFillEnv(pFormFillEnv) {
|
| + m_pWidgetHandler->SetFormFiller(m_pFormFillEnv->GetInteractiveFormFiller());
|
| }
|
|
|
| CPDFSDK_AnnotHandlerMgr::~CPDFSDK_AnnotHandlerMgr() {}
|
| @@ -198,14 +198,15 @@ FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChar(CPDFSDK_Annot* pAnnot,
|
| FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
|
| int nKeyCode,
|
| int nFlag) {
|
| - if (m_pEnv->IsCTRLKeyDown(nFlag) || m_pEnv->IsALTKeyDown(nFlag))
|
| + if (m_pFormFillEnv->IsCTRLKeyDown(nFlag) ||
|
| + m_pFormFillEnv->IsALTKeyDown(nFlag))
|
| return GetAnnotHandler(pAnnot)->OnKeyDown(pAnnot, nKeyCode, nFlag);
|
|
|
| CPDFSDK_PageView* pPage = pAnnot->GetPageView();
|
| CPDFSDK_Annot* pFocusAnnot = pPage->GetFocusAnnot();
|
| if (pFocusAnnot && (nKeyCode == FWL_VKEY_Tab)) {
|
| CPDFSDK_Annot::ObservedPtr pNext(
|
| - GetNextAnnot(pFocusAnnot, !m_pEnv->IsSHIFTKeyDown(nFlag)));
|
| + GetNextAnnot(pFocusAnnot, !m_pFormFillEnv->IsSHIFTKeyDown(nFlag)));
|
| if (pNext && pNext.Get() != pFocusAnnot) {
|
| pPage->GetFormFillEnv()->SetFocusAnnot(&pNext);
|
| return TRUE;
|
|
|