diff options
Diffstat (limited to 'fpdfsdk/fpdf_formfill.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_formfill.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index a3a471c1f8..8a43fa6e77 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -621,11 +621,7 @@ FPDF_EXPORT void FPDF_CALLCONV FORM_DoDocumentAAction(FPDF_FORMHANDLE hHandle, if (!pDict) return; - CPDF_Dictionary* pActionDict = pDict->GetDictFor("AA"); - if (!pActionDict) - return; - - CPDF_AAction aa(pActionDict); + CPDF_AAction aa(pDict->GetDictFor("AA")); auto type = static_cast<CPDF_AAction::AActionType>(aaType); if (aa.ActionExist(type)) { CPDF_Action action = aa.GetAction(type); @@ -645,22 +641,20 @@ FPDF_EXPORT void FPDF_CALLCONV FORM_DoPageAAction(FPDF_PAGE page, UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page); CPDF_Page* pPDFPage = CPDFPageFromFPDFPage(page); - if (!pPDFPage || !pFormFillEnv->GetPageView(pPage, false)) - return; - - CPDFSDK_ActionHandler* pActionHandler = pFormFillEnv->GetActionHandler(); - CPDF_Dictionary* pPageDict = pPDFPage->GetFormDict(); - if (!pPageDict) + if (!pPDFPage) return; - CPDF_Dictionary* pActionDict = pPageDict->GetDictFor("AA"); - if (!pActionDict) + if (!pFormFillEnv->GetPageView(pPage, false)) return; - CPDF_AAction aa(pActionDict); + CPDFSDK_ActionHandler* pActionHandler = pFormFillEnv->GetActionHandler(); + CPDF_Dictionary* pPageDict = pPDFPage->GetFormDict(); + CPDF_AAction aa(pPageDict->GetDictFor("AA")); CPDF_AAction::AActionType type = aaType == FPDFPAGE_AACTION_OPEN ? CPDF_AAction::OpenPage : CPDF_AAction::ClosePage; - if (aa.ActionExist(type)) - pActionHandler->DoAction_Page(aa.GetAction(type), type, pFormFillEnv); + if (aa.ActionExist(type)) { + CPDF_Action action = aa.GetAction(type); + pActionHandler->DoAction_Page(action, type, pFormFillEnv); + } } |