Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: fpdfsdk/include/javascript/JS_Define.h

Issue 733693003: Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Simplified GetAttrValue to just assign *pValue and to share code. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/src/fxcrt/fxcrt_platforms.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/include/javascript/JS_Define.h
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 62a8d1417eee537fc9a3c9bb6d1cd0a39d8a428b..379af0662a63b711d32a3c0a66ed09baa32076e4 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)\
{\
« no previous file with comments | « core/src/fxcrt/fxcrt_platforms.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698