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/src/javascript/PublicMethods.cpp | |
| 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/src/javascript/PublicMethods.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/PublicMethods.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index 4c51c9ae25..82bffe67bf 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -1554,7 +1554,7 @@ FX_BOOL CJS_PublicMethods::AFDate_FormatEx(OBJ_METHOD_PARAMS) if (JS_PortIsNan(dDate)) { CFX_WideString swMsg; - swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat); + swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str()); Alert(pContext, swMsg); return FALSE; } @@ -1652,7 +1652,7 @@ FX_BOOL CJS_PublicMethods::AFDate_KeystrokeEx(OBJ_METHOD_PARAMS) if (bWrongFormat || JS_PortIsNan(dRet)) { CFX_WideString swMsg; - swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat); + swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str()); Alert(pContext, swMsg); pEvent->Rc() = FALSE; return TRUE; @@ -2059,7 +2059,7 @@ FX_BOOL CJS_PublicMethods::AFParseDateEx(OBJ_METHOD_PARAMS) if (JS_PortIsNan(dDate)) { CFX_WideString swMsg; - swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat); + swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str()); Alert((CJS_Context *)cc, swMsg); return FALSE; } @@ -2304,7 +2304,7 @@ FX_BOOL CJS_PublicMethods::AFExtractNums(OBJ_METHOD_PARAMS) { if (sPart.GetLength() > 0) { - nums.SetElement(nIndex,CJS_Value(isolate,(FX_LPCWSTR)sPart)); + nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str())); sPart = L""; nIndex ++; } @@ -2313,7 +2313,7 @@ FX_BOOL CJS_PublicMethods::AFExtractNums(OBJ_METHOD_PARAMS) if (sPart.GetLength() > 0) { - nums.SetElement(nIndex,CJS_Value(isolate,(FX_LPCWSTR)sPart)); + nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str())); } if (nums.GetLength() > 0) |