| Index: fpdfsdk/fsdk_actionhandler.cpp
|
| diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp
|
| index 8168d4a1b544e294298ee7a36d14749bd38d2303..64fbe179610e1bff19ad552482f8ba85683e2185 100644
|
| --- a/fpdfsdk/fsdk_actionhandler.cpp
|
| +++ b/fpdfsdk/fsdk_actionhandler.cpp
|
| @@ -11,8 +11,8 @@
|
| #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
|
| #include "core/fpdfdoc/include/cpdf_formfield.h"
|
| #include "core/fpdfdoc/include/cpdf_interform.h"
|
| -#include "fpdfsdk/include/cpdfdoc_environment.h"
|
| #include "fpdfsdk/include/cpdfsdk_document.h"
|
| +#include "fpdfsdk/include/cpdfsdk_environment.h"
|
| #include "fpdfsdk/include/cpdfsdk_interform.h"
|
| #include "fpdfsdk/include/fsdk_define.h"
|
| #include "fpdfsdk/javascript/ijs_context.h"
|
| @@ -46,7 +46,7 @@ FX_BOOL CPDFSDK_ActionHandler::DoAction_FieldJavaScript(
|
| CPDFSDK_Document* pDocument,
|
| CPDF_FormField* pFormField,
|
| PDFSDK_FieldAction& data) {
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (pEnv->IsJSInitiated() && JsAction.GetType() == CPDF_Action::JavaScript) {
|
| CFX_WideString swJS = JsAction.GetJavaScript();
|
| @@ -116,7 +116,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentOpenAction(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -148,7 +148,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteLinkAction(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -193,7 +193,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteDocumentPageAction(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -240,7 +240,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteFieldAction(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -277,7 +277,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteScreenAction(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -320,7 +320,7 @@ FX_BOOL CPDFSDK_ActionHandler::ExecuteBookMark(
|
|
|
| visited->insert(pDict);
|
|
|
| - CPDFDoc_Environment* pEnv = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pEnv = pDocument->GetEnv();
|
| ASSERT(pEnv);
|
| if (action.GetType() == CPDF_Action::JavaScript) {
|
| if (pEnv->IsJSInitiated()) {
|
| @@ -438,7 +438,7 @@ void CPDFSDK_ActionHandler::DoAction_GoTo(CPDFSDK_Document* pDocument,
|
| sizeOfAry = j;
|
| }
|
|
|
| - CPDFDoc_Environment* pApp = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pApp = pDocument->GetEnv();
|
| pApp->FFI_DoGoToAction(nPageIndex, nFitType, pPosAry, sizeOfAry);
|
| delete[] pPosAry;
|
| }
|
| @@ -453,7 +453,7 @@ void CPDFSDK_ActionHandler::DoAction_URI(CPDFSDK_Document* pDocument,
|
| const CPDF_Action& action) {
|
| ASSERT(action.GetDict());
|
|
|
| - CPDFDoc_Environment* pApp = pDocument->GetEnv();
|
| + CPDFSDK_Environment* pApp = pDocument->GetEnv();
|
| CFX_ByteString sURI = action.GetURI(pDocument->GetPDFDocument());
|
| pApp->FFI_DoURIAction(sURI.c_str());
|
| }
|
|
|