From 31e446374a7cf3f3353e42a03b6d5297e5cd60ec Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 15 Apr 2016 16:04:24 -0700 Subject: Avoid narrowing of strings in FWL SetEditText methods. Review URL: https://codereview.chromium.org/1892813004 --- xfa/fwl/lightwidget/cfwl_combobox.cpp | 2 +- xfa/fwl/lightwidget/cfwl_combobox.h | 2 +- xfa/fwl/lightwidget/cfwl_datetimepicker.cpp | 2 +- xfa/fwl/lightwidget/cfwl_datetimepicker.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/lightwidget/cfwl_combobox.cpp index bdcc36fa30..f2cd1f5d6b 100644 --- a/xfa/fwl/lightwidget/cfwl_combobox.cpp +++ b/xfa/fwl/lightwidget/cfwl_combobox.cpp @@ -88,7 +88,7 @@ FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel) { return static_cast(m_pIface)->SetCurSel(iSel); } -FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText) { +FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideString& wsText) { if (!m_pIface) return FWL_ERR_Indefinite; return static_cast(m_pIface)->SetEditText(wsText); diff --git a/xfa/fwl/lightwidget/cfwl_combobox.h b/xfa/fwl/lightwidget/cfwl_combobox.h index 59b542c453..c92a063cdf 100644 --- a/xfa/fwl/lightwidget/cfwl_combobox.h +++ b/xfa/fwl/lightwidget/cfwl_combobox.h @@ -30,7 +30,7 @@ class CFWL_ComboBox : public CFWL_Widget { FWL_ERR GetTextByIndex(int32_t iIndex, CFX_WideString& wsText); int32_t GetCurSel(); FWL_ERR SetCurSel(int32_t iSel); - FWL_ERR SetEditText(const CFX_WideStringC& wsText); + FWL_ERR SetEditText(const CFX_WideString& wsText); int32_t GetEditTextLength() const; FWL_ERR GetEditText(CFX_WideString& wsText, int32_t nStart = 0, diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp b/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp index e470616ed8..ba99ad8551 100644 --- a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp +++ b/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp @@ -58,7 +58,7 @@ FWL_ERR CFWL_DateTimePicker::GetEditText(CFX_WideString& wsText) { return static_cast(m_pIface)->GetEditText(wsText); } -FWL_ERR CFWL_DateTimePicker::SetEditText(const CFX_WideStringC& wsText) { +FWL_ERR CFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) { return static_cast(m_pIface)->SetEditText(wsText); } diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.h b/xfa/fwl/lightwidget/cfwl_datetimepicker.h index a96ac532c1..befe57a079 100644 --- a/xfa/fwl/lightwidget/cfwl_datetimepicker.h +++ b/xfa/fwl/lightwidget/cfwl_datetimepicker.h @@ -16,7 +16,7 @@ class CFWL_DateTimePicker : public CFWL_Widget { FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay); FWL_ERR GetEditText(CFX_WideString& wsText); - FWL_ERR SetEditText(const CFX_WideStringC& wsText); + FWL_ERR SetEditText(const CFX_WideString& wsText); int32_t CountSelRanges(); int32_t GetSelRange(int32_t nIndex, int32_t& nStart); FWL_ERR GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay); -- cgit v1.2.3