diff options
| author | tsepez <tsepez@chromium.org> | 2016-09-08 11:28:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-08 11:28:14 -0700 |
| commit | a31da74cffa8c3ff919051cc49bc006aeb55d345 (patch) | |
| tree | 0457bd7c0a74298d47e25cd1cdbf13b2622493ef /fpdfsdk/javascript/Field.cpp | |
| parent | cd5dc855df0ca37b7667b5f3ceb951d2d417d99f (diff) | |
| download | pdfium-a31da74cffa8c3ff919051cc49bc006aeb55d345.tar.xz | |
Pass CFX_WideString further down widget callers
Avoid a couple of places where we copy the raw string back into a
brand-new widestring.
There are a few places where the difference between a null
ptr and an empty string control the logic, and I left these
as-is. Other places can just take the string by const ref.
Review-Url: https://codereview.chromium.org/2323493002
Diffstat (limited to 'fpdfsdk/javascript/Field.cpp')
| -rw-r--r-- | fpdfsdk/javascript/Field.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index a788fb203b..9ecdec6936 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -275,7 +275,7 @@ void Field::UpdateFormField(CPDFSDK_Document* pDocument, static_cast<CPDFSDK_Widget*>(pAnnot)->OnFormat(bFormatted); if (pAnnot) { static_cast<CPDFSDK_Widget*>(pAnnot)->ResetAppearance( - bFormatted ? sValue.c_str() : nullptr, FALSE); + bFormatted ? &sValue : nullptr, FALSE); } } } else { @@ -319,10 +319,7 @@ void Field::UpdateFormControl(CPDFSDK_Document* pDocument, nFieldType == FIELDTYPE_TEXTFIELD) { FX_BOOL bFormatted = FALSE; CFX_WideString sValue = pWidget->OnFormat(bFormatted); - if (bFormatted) - pWidget->ResetAppearance(sValue.c_str(), FALSE); - else - pWidget->ResetAppearance(nullptr, FALSE); + pWidget->ResetAppearance(bFormatted ? &sValue : nullptr, FALSE); } else { pWidget->ResetAppearance(nullptr, FALSE); } |