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/Field.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/Field.cpp')
| -rw-r--r-- | fpdfsdk/src/javascript/Field.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 4b1f20ac16..24de66d54d 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -194,7 +194,7 @@ FX_BOOL Field::AttachField(Document* pDocument, const CFX_WideString& csFieldNam { std::wstring strFieldName; int iControlNo = -1; - ParseFieldName((FX_LPCWSTR)swFieldNameTemp, strFieldName, iControlNo); + ParseFieldName(swFieldNameTemp.c_str(), strFieldName, iControlNo); if (iControlNo == -1) return FALSE; m_FieldName = strFieldName.c_str(); @@ -1573,7 +1573,7 @@ FX_BOOL Field::exportValues(OBJ_PROP_PARAMS) CPDF_FormControl* pFormControl = pFormField->GetControl(i); ASSERT(pFormControl != NULL); - ExportValusArray.SetElement(i, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue())); + ExportValusArray.SetElement(i, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str())); } } else @@ -1582,7 +1582,7 @@ FX_BOOL Field::exportValues(OBJ_PROP_PARAMS) CPDF_FormControl* pFormControl = pFormField->GetControl(m_nFormControlIndex); if (!pFormControl) return FALSE; - ExportValusArray.SetElement(0, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue())); + ExportValusArray.SetElement(0, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str())); } vp << ExportValusArray; @@ -3322,7 +3322,7 @@ FX_BOOL Field::valueAsString(OBJ_PROP_PARAMS) { if (pFormField->GetControl(i)->IsChecked()) { - vp << (FX_LPCWSTR)pFormField->GetControl(i)->GetExportValue(); + vp << pFormField->GetControl(i)->GetExportValue().c_str(); break; } else @@ -3334,7 +3334,7 @@ FX_BOOL Field::valueAsString(OBJ_PROP_PARAMS) vp << L""; } else - vp << (FX_LPCWSTR)pFormField->GetValue(); + vp << pFormField->GetValue().c_str(); return TRUE; } |