| Index: fpdfsdk/src/javascript/global.cpp
|
| diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
|
| index 587ba852194a7296420a49be5362b992d2a9d619..cc18b2906c785949c4cac2b5f884513c129d340c 100644
|
| --- a/fpdfsdk/src/javascript/global.cpp
|
| +++ b/fpdfsdk/src/javascript/global.cpp
|
| @@ -4,15 +4,16 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#include "../../include/javascript/JavaScript.h"
|
| #include "../../include/javascript/IJavaScript.h"
|
| +#include "../../include/javascript/JS_Context.h"
|
| #include "../../include/javascript/JS_Define.h"
|
| +#include "../../include/javascript/JS_EventHandler.h"
|
| +#include "../../include/javascript/JS_GlobalData.h"
|
| #include "../../include/javascript/JS_Object.h"
|
| #include "../../include/javascript/JS_Value.h"
|
| -#include "../../include/javascript/JS_GlobalData.h"
|
| +#include "../../include/javascript/JavaScript.h"
|
| #include "../../include/javascript/global.h"
|
| -#include "../../include/javascript/JS_EventHandler.h"
|
| -#include "../../include/javascript/JS_Context.h"
|
| +#include "../../include/javascript/resource.h"
|
|
|
| /* ---------------------------- global ---------------------------- */
|
|
|
| @@ -270,9 +271,10 @@ FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, FX_LPCWSTR propname, CJS
|
|
|
| FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError)
|
| {
|
| + CJS_Context* pContext = static_cast<CJS_Context*>(cc);
|
| if (params.size() != 2)
|
| {
|
| - //sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR);
|
| + sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
|
| return FALSE;
|
| }
|
|
|
| @@ -288,7 +290,7 @@ FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters&
|
| }
|
| }
|
|
|
| - //sError = JSGetStringFromID(IDS_JSPARAM_INCORRECT);
|
| + sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
|
| return FALSE;
|
| }
|
|
|
|
|