diff options
| author | Bruce Dawson <brucedawson@google.com> | 2014-12-08 13:10:02 -0800 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2014-12-08 13:10:02 -0800 |
| commit | b69da0b96ffdad124efd1b48d51c617bb216a98e (patch) | |
| tree | 61d7c0212eaf4998591d0b941bfceb5646778062 /fpdfsdk/src/fsdk_baseform.cpp | |
| parent | 4b87f7b5f8fe26ee4869a21a8b0b4697cba51a93 (diff) | |
| download | pdfium-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/src/fsdk_baseform.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index aa87dd56bb..e73bd32913 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1074,9 +1074,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(); @@ -1161,7 +1161,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(); @@ -1280,7 +1280,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(); @@ -2282,7 +2282,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; } @@ -2433,7 +2433,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) { |