summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/javascript/JS_Define.h
diff options
context:
space:
mode:
authorBruce Dawson <brucedawson@google.com>2014-12-08 13:10:02 -0800
committerBruce Dawson <brucedawson@google.com>2014-12-08 13:10:02 -0800
commitb69da0b96ffdad124efd1b48d51c617bb216a98e (patch)
tree61d7c0212eaf4998591d0b941bfceb5646778062 /fpdfsdk/include/javascript/JS_Define.h
parent4b87f7b5f8fe26ee4869a21a8b0b4697cba51a93 (diff)
downloadpdfium-b69da0b96ffdad124efd1b48d51c617bb216a98e.tar.xz
Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this.
Since casts to FX_LPCWSTR have been shown to hide bugs I tried removing more of them, targeting those places where a cast was used to force a conversion from CFX_WideString to FX_LPCWSTR, replacing these casts with calls to the newly added .c_str() function. This revealed two places where the cast was hiding a bug -- where ->c_str() was required instead! This removes ~33 FX_LPCWSTR casts and there are ~31 left, many of which will go away in some future change. Also includes this change: Removing unnecessary casts from wchar_t* to wchar_t*, by various names. Original patch from Bruce Dawson(brucedawson@chromium.org) R=bo_xu@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/733693003
Diffstat (limited to 'fpdfsdk/include/javascript/JS_Define.h')
-rw-r--r--fpdfsdk/include/javascript/JS_Define.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 62a8d1417e..379af0662a 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -341,8 +341,8 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
ASSERT(pObj != NULL);\
FX_BOOL bRet = FALSE;\
MEMLEAKCHECK_1();\
- bRet = pObj->QueryProperty((FX_LPCWSTR)propname);\
- MEMLEAKCHECK_2(class_name, (FX_LPCWSTR)prop_name);\
+ bRet = pObj->QueryProperty(propname.c_str());\
+ MEMLEAKCHECK_2(class_name, prop_name.c_str());\
if (bRet)\
{\
info.GetReturnValue().Set(0x004);\
@@ -376,7 +376,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
JS_ErrorString sError;\
FX_BOOL bRet = FALSE;\
MEMLEAKCHECK_1();\
- bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, value, sError);\
+ bRet = pObj->DoProperty(cc, propname.c_str(), value, sError);\
MEMLEAKCHECK_2(class_name, L"GetProperty");\
if (bRet)\
{\
@@ -414,7 +414,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
JS_ErrorString sError;\
FX_BOOL bRet = FALSE;\
MEMLEAKCHECK_1();\
- bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, PropValue, sError);\
+ bRet = pObj->DoProperty(cc, propname.c_str(), PropValue, sError);\
MEMLEAKCHECK_2(class_name,L"PutProperty");\
if (bRet)\
{\
@@ -449,7 +449,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
JS_ErrorString sError;\
FX_BOOL bRet = FALSE;\
MEMLEAKCHECK_1();\
- bRet = pObj->DelProperty(cc, (FX_LPCWSTR)propname, sError);\
+ bRet = pObj->DelProperty(cc, propname.c_str(), sError);\
MEMLEAKCHECK_2(class_name,L"DelProperty");\
if (bRet)\
{\