diff options
| author | Bruce Dawson <brucedawson@google.com> | 2014-12-23 12:21:02 -0800 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2014-12-23 12:21:02 -0800 |
| commit | 0a476d22c89eb99d36dfd6c9955dd12d1513a870 (patch) | |
| tree | 6f66fd7da1565546bd1b0d0447d827463c1d5988 /fpdfsdk/include | |
| parent | 1be4117d0ea336203680c64d9d0a1ae1d5a6cf61 (diff) | |
| download | pdfium-0a476d22c89eb99d36dfd6c9955dd12d1513a870.tar.xz | |
XFA: merge patch from CL 733693003, getting rid of more casts
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)
TBR=bo_xu@foxitsoftware.com, tsepez@chromium.org
Review URL: https://codereview.chromium.org/811593007
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Define.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index a60db4aa3f..8ead492548 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -332,8 +332,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);\ @@ -364,7 +364,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)\ {\ @@ -399,7 +399,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)\ {\ @@ -431,7 +431,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)\ {\ |