| Index: fpdfsdk/fsdk_actionhandler.cpp
|
| diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp
|
| index 3c72f6e0acb3ce0ae5d2169e807109328e1212db..c324406359dcfcbd5cc7291406738031824123c1 100644
|
| --- a/fpdfsdk/fsdk_actionhandler.cpp
|
| +++ b/fpdfsdk/fsdk_actionhandler.cpp
|
| @@ -222,8 +222,7 @@ FX_BOOL CPDFSDK_ActionHandler::IsValidField(
|
| CPDF_Dictionary* pFieldDict) {
|
| ASSERT(pFieldDict);
|
|
|
| - CPDFSDK_InterForm* pInterForm =
|
| - pFormFillEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = pFormFillEnv->GetInterForm();
|
| CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
|
| return !!pPDFInterForm->GetFieldByDict(pFieldDict);
|
| }
|
| @@ -417,8 +416,7 @@ void CPDFSDK_ActionHandler::DoAction_GoTo(
|
| const CPDF_Action& action) {
|
| ASSERT(action.GetDict());
|
|
|
| - CPDF_Document* pPDFDocument =
|
| - pFormFillEnv->GetSDKDocument()->GetPDFDocument();
|
| + CPDF_Document* pPDFDocument = pFormFillEnv->GetPDFDocument();
|
| ASSERT(pPDFDocument);
|
|
|
| CPDF_Dest MyDest = action.GetDest(pPDFDocument);
|
| @@ -453,8 +451,7 @@ void CPDFSDK_ActionHandler::DoAction_URI(
|
| const CPDF_Action& action) {
|
| ASSERT(action.GetDict());
|
|
|
| - CFX_ByteString sURI =
|
| - action.GetURI(pFormFillEnv->GetSDKDocument()->GetPDFDocument());
|
| + CFX_ByteString sURI = action.GetURI(pFormFillEnv->GetPDFDocument());
|
| pFormFillEnv->DoURIAction(sURI.c_str());
|
| }
|
|
|
| @@ -596,10 +593,9 @@ void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(
|
| FX_BOOL CPDFSDK_ActionHandler::DoAction_Hide(
|
| const CPDF_Action& action,
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv) {
|
| - CPDFSDK_InterForm* pInterForm =
|
| - pFormFillEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = pFormFillEnv->GetInterForm();
|
| if (pInterForm->DoAction_Hide(action)) {
|
| - pFormFillEnv->GetSDKDocument()->SetChangeMark();
|
| + pFormFillEnv->SetChangeMark();
|
| return TRUE;
|
| }
|
|
|
| @@ -609,26 +605,23 @@ FX_BOOL CPDFSDK_ActionHandler::DoAction_Hide(
|
| FX_BOOL CPDFSDK_ActionHandler::DoAction_SubmitForm(
|
| const CPDF_Action& action,
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv) {
|
| - CPDFSDK_InterForm* pInterForm =
|
| - pFormFillEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = pFormFillEnv->GetInterForm();
|
| return pInterForm->DoAction_SubmitForm(action);
|
| }
|
|
|
| FX_BOOL CPDFSDK_ActionHandler::DoAction_ResetForm(
|
| const CPDF_Action& action,
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv) {
|
| - CPDFSDK_InterForm* pInterForm =
|
| - pFormFillEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = pFormFillEnv->GetInterForm();
|
| return pInterForm->DoAction_ResetForm(action);
|
| }
|
|
|
| FX_BOOL CPDFSDK_ActionHandler::DoAction_ImportData(
|
| const CPDF_Action& action,
|
| CPDFSDK_FormFillEnvironment* pFormFillEnv) {
|
| - CPDFSDK_InterForm* pInterForm =
|
| - pFormFillEnv->GetSDKDocument()->GetInterForm();
|
| + CPDFSDK_InterForm* pInterForm = pFormFillEnv->GetInterForm();
|
| if (pInterForm->DoAction_ImportData(action)) {
|
| - pFormFillEnv->GetSDKDocument()->SetChangeMark();
|
| + pFormFillEnv->SetChangeMark();
|
| return TRUE;
|
| }
|
|
|
|
|