From 0a476d22c89eb99d36dfd6c9955dd12d1513a870 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Tue, 23 Dec 2014 12:21:02 -0800 Subject: 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 --- fpdfsdk/src/fsdk_baseform.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/src/fsdk_baseform.cpp') diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index c301a8760a..5dbd4f721b 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1711,9 +1711,9 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(FX_LPCWSTR sValue) FX_INT32 nCurSel = pField->GetSelectedIndex(0); if (nCurSel < 0) - pEdit->SetText((FX_LPCWSTR)pField->GetValue()); + pEdit->SetText(pField->GetValue().c_str()); else - pEdit->SetText((FX_LPCWSTR)pField->GetOptionLabel(nCurSel)); + pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str()); } CPDF_Rect rcContent = pEdit->GetContentRect(); @@ -1798,7 +1798,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() } } - pEdit->SetText((FX_LPCWSTR)pField->GetOptionLabel(i)); + pEdit->SetText(pField->GetOptionLabel(i).c_str()); CPDF_Rect rcContent = pEdit->GetContentRect(); FX_FLOAT fItemHeight = rcContent.Height(); @@ -1924,7 +1924,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(FX_LPCWSTR sValue) if (sValue) pEdit->SetText(sValue); else - pEdit->SetText((FX_LPCWSTR)pField->GetValue()); + pEdit->SetText(pField->GetValue().c_str()); CPDF_Rect rcContent = pEdit->GetContentRect(); @@ -3051,7 +3051,7 @@ FX_BOOL CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination, con return FALSE; } - pEnv->JS_docSubmitForm(pBuffer, nBufSize, (FX_LPCWSTR)csDestination); + pEnv->JS_docSubmitForm(pBuffer, nBufSize, csDestination.c_str()); return TRUE; } @@ -3223,7 +3223,7 @@ FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, FX_BOO return FALSE; } - pEnv->JS_docSubmitForm(pBuffer, nBufSize, (FX_LPCWSTR)sDestination); + pEnv->JS_docSubmitForm(pBuffer, nBufSize, sDestination.c_str()); if (bUrlEncoded && pBuffer) { -- cgit v1.2.3