From 14a60c50b10de1d9e4edd3629ea210a816940a75 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 16 Nov 2016 12:15:27 -0800 Subject: Continue formatting fwl/core Review-Url: https://codereview.chromium.org/2506083002 --- xfa/fxfa/app/xfa_ffchoicelist.cpp | 12 ++++++------ xfa/fxfa/app/xfa_ffchoicelist.h | 6 +++--- xfa/fxfa/app/xfa_ffwidget.cpp | 16 +++++++--------- xfa/fxfa/xfa_ffwidget.h | 6 +++--- 4 files changed, 19 insertions(+), 21 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index 93e270da3e..e516ffde95 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -439,14 +439,14 @@ bool CXFA_FFComboBox::Paste(const CFX_WideString& wsPaste) { return m_pDataAcc->IsChoiceListAllowTextEntry() && ((CFWL_ComboBox*)m_pNormalWidget)->EditPaste(wsPaste); } -bool CXFA_FFComboBox::SelectAll() { - return ((CFWL_ComboBox*)m_pNormalWidget)->EditSelectAll(); +void CXFA_FFComboBox::SelectAll() { + ((CFWL_ComboBox*)m_pNormalWidget)->EditSelectAll(); } -bool CXFA_FFComboBox::Delete() { - return ((CFWL_ComboBox*)m_pNormalWidget)->EditDelete(); +void CXFA_FFComboBox::Delete() { + ((CFWL_ComboBox*)m_pNormalWidget)->EditDelete(); } -bool CXFA_FFComboBox::DeSelect() { - return ((CFWL_ComboBox*)m_pNormalWidget)->EditDeSelect(); +void CXFA_FFComboBox::DeSelect() { + ((CFWL_ComboBox*)m_pNormalWidget)->EditDeSelect(); } void CXFA_FFComboBox::SetItemState(int32_t nIndex, bool bSelected) { if (bSelected) { diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 9ce6cccd11..720807f968 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -63,9 +63,9 @@ class CXFA_FFComboBox : public CXFA_FFField { bool Copy(CFX_WideString& wsCopy) override; bool Cut(CFX_WideString& wsCut) override; bool Paste(const CFX_WideString& wsPaste) override; - bool SelectAll() override; - bool Delete() override; - bool DeSelect() override; + void SelectAll() override; + void Delete() override; + void DeSelect() override; // IFWL_WidgetDelegate void OnProcessMessage(CFWL_Message* pMessage) override; diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 89b3053b57..07ba16cd80 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -304,15 +304,13 @@ bool CXFA_FFWidget::Cut(CFX_WideString& wsCut) { bool CXFA_FFWidget::Paste(const CFX_WideString& wsPaste) { return false; } -bool CXFA_FFWidget::SelectAll() { - return false; -} -bool CXFA_FFWidget::Delete() { - return false; -} -bool CXFA_FFWidget::DeSelect() { - return false; -} + +void CXFA_FFWidget::SelectAll() {} + +void CXFA_FFWidget::Delete() {} + +void CXFA_FFWidget::DeSelect() {} + bool CXFA_FFWidget::GetSuggestWords(CFX_PointF pointf, std::vector& sSuggest) { return false; diff --git a/xfa/fxfa/xfa_ffwidget.h b/xfa/fxfa/xfa_ffwidget.h index a2aaee2fe2..3c2af1647c 100644 --- a/xfa/fxfa/xfa_ffwidget.h +++ b/xfa/fxfa/xfa_ffwidget.h @@ -92,9 +92,9 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { virtual bool Copy(CFX_WideString& wsCopy); virtual bool Cut(CFX_WideString& wsCut); virtual bool Paste(const CFX_WideString& wsPaste); - virtual bool SelectAll(); - virtual bool Delete(); - virtual bool DeSelect(); + virtual void SelectAll(); + virtual void Delete(); + virtual void DeSelect(); virtual bool GetSuggestWords(CFX_PointF pointf, std::vector& sSuggest); virtual bool ReplaceSpellCheckWord(CFX_PointF pointf, -- cgit v1.2.3