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/include | |
| 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/include')
| -rw-r--r-- | fpdfsdk/include/cpdfsdk_interform.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/cpdfsdk_widget.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h index d900fe2ae8..b4b5db3fca 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/include/cpdfsdk_interform.h @@ -70,7 +70,7 @@ class CPDFSDK_InterForm : public IPDF_FormNotify { CFX_WideString OnFormat(CPDF_FormField* pFormField, FX_BOOL& bFormatted); void ResetFieldAppearance(CPDF_FormField* pFormField, - const FX_WCHAR* sValue, + const CFX_WideString* sValue, FX_BOOL bValueChanged); void UpdateField(CPDF_FormField* pFormField); diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h index bf033ccc3a..09f9d94693 100644 --- a/fpdfsdk/include/cpdfsdk_widget.h +++ b/fpdfsdk/include/cpdfsdk_widget.h @@ -108,7 +108,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { #ifdef PDF_ENABLE_XFA void ResetAppearance(FX_BOOL bValueChanged); #endif // PDF_ENABLE_XFA - void ResetAppearance(const FX_WCHAR* sValue, FX_BOOL bValueChanged); + void ResetAppearance(const CFX_WideString* sValue, FX_BOOL bValueChanged); void ResetFieldAppearance(FX_BOOL bValueChanged); void UpdateField(); CFX_WideString OnFormat(FX_BOOL& bFormatted); @@ -144,9 +144,9 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { void ResetAppearance_PushButton(); void ResetAppearance_CheckBox(); void ResetAppearance_RadioButton(); - void ResetAppearance_ComboBox(const FX_WCHAR* sValue); + void ResetAppearance_ComboBox(const CFX_WideString* sValue); void ResetAppearance_ListBox(); - void ResetAppearance_TextField(const FX_WCHAR* sValue); + void ResetAppearance_TextField(const CFX_WideString* sValue); CFX_FloatRect GetClientRect() const; CFX_FloatRect GetRotatedRect() const; |