diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Define.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/PublicMethods.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 379af0662a..0821b6238b 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -623,7 +623,7 @@ if (JS_DefineGlobalConst(pRuntime,JS_WIDESTRING(const_name),JS_NewString(pRuntim /* ======================================== GLOBAL ARRAYS ============================================ */ #define DEFINE_GLOBAL_ARRAY(pRuntime)\ -int size = sizeof(ArrayContent) / sizeof(FX_LPCWSTR);\ +int size = FX_ArraySize(ArrayContent);\ \ CJS_Array array(pRuntime);\ for (int i=0; i<size; i++) array.SetElement(i,CJS_Value(pRuntime,ArrayContent[i]));\ diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index 82bffe67bf..b29a5b4f3c 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -1679,11 +1679,11 @@ FX_BOOL CJS_PublicMethods::AFDate_Format(OBJ_METHOD_PARAMS) L"yy-mm-dd", L"mmm-yy", L"mmmm-yy", L"mmm d, yyyy", L"mmmm d, yyyy", L"m/d/yy h:MM tt", L"m/d/yy HH:MM" }; - ASSERT(iIndex < sizeof(cFormats)/sizeof(FX_LPCWSTR)); + ASSERT(iIndex < FX_ArraySize(cFormats)); if (iIndex < 0) iIndex = 0; - if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR)) + if (iIndex >= FX_ArraySize(cFormats)) iIndex = 0; CJS_Parameters newParams; CJS_Value val(isolate,cFormats[iIndex]); @@ -1710,11 +1710,11 @@ FX_BOOL CJS_PublicMethods::AFDate_Keystroke(OBJ_METHOD_PARAMS) L"yy-mm-dd", L"mmm-yy", L"mmmm-yy", L"mmm d, yyyy", L"mmmm d, yyyy", L"m/d/yy h:MM tt", L"m/d/yy HH:MM" }; - ASSERT(iIndex<sizeof(cFormats)/sizeof(FX_LPCWSTR)); + ASSERT(iIndex<FX_ArraySize(cFormats)); if (iIndex < 0) iIndex = 0; - if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR)) + if (iIndex >= FX_ArraySize(cFormats)) iIndex = 0; CJS_Parameters newParams; CJS_Value val(isolate,cFormats[iIndex]); @@ -1738,11 +1738,11 @@ FX_BOOL CJS_PublicMethods::AFTime_Format(OBJ_METHOD_PARAMS) int iIndex = params[0]; FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"}; - ASSERT(iIndex<sizeof(cFormats)/sizeof(FX_LPCWSTR)); + ASSERT(iIndex<FX_ArraySize(cFormats)); if (iIndex < 0) iIndex = 0; - if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR)) + if (iIndex >= FX_ArraySize(cFormats)) iIndex = 0; CJS_Parameters newParams; CJS_Value val(isolate,cFormats[iIndex]); @@ -1764,11 +1764,11 @@ FX_BOOL CJS_PublicMethods::AFTime_Keystroke(OBJ_METHOD_PARAMS) int iIndex = params[0]; FX_LPCWSTR cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"}; - ASSERT(iIndex<sizeof(cFormats)/sizeof(FX_LPCWSTR)); + ASSERT(iIndex<FX_ArraySize(cFormats)); if (iIndex < 0) iIndex = 0; - if (iIndex >= sizeof(cFormats)/sizeof(FX_LPCWSTR)) + if (iIndex >= FX_ArraySize(cFormats)) iIndex = 0; CJS_Parameters newParams; CJS_Value val(isolate,cFormats[iIndex]); |