From 245f80c4ae2bde11de8fdff54e736ec4e4296e0a Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Fri, 5 Jan 2018 15:40:40 -0500 Subject: Convert CFWL_Edit Cut & Copy out param to return Change-Id: I99776deb809609f69275848ddb81706e2cc82c82 Reviewed-on: https://pdfium-review.googlesource.com/22370 Reviewed-by: Henrique Nakashima Commit-Queue: Ryan Harrison --- xfa/fxfa/cxfa_ffcombobox.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_ffcombobox.cpp') diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp index 58a0f94f9d..13bda7adbb 100644 --- a/xfa/fxfa/cxfa_ffcombobox.cpp +++ b/xfa/fxfa/cxfa_ffcombobox.cpp @@ -232,13 +232,15 @@ bool CXFA_FFComboBox::CanSelectAll() { return ToComboBox(m_pNormalWidget.get())->EditCanSelectAll(); } -bool CXFA_FFComboBox::Copy(WideString& wsCopy) { - return ToComboBox(m_pNormalWidget.get())->EditCopy(wsCopy); +Optional CXFA_FFComboBox::Copy() { + return ToComboBox(m_pNormalWidget.get())->EditCopy(); } -bool CXFA_FFComboBox::Cut(WideString& wsCut) { - return m_pDataAcc->IsChoiceListAllowTextEntry() && - ToComboBox(m_pNormalWidget.get())->EditCut(wsCut); +Optional CXFA_FFComboBox::Cut() { + if (!m_pDataAcc->IsChoiceListAllowTextEntry()) + return {}; + + return ToComboBox(m_pNormalWidget.get())->EditCut(); } bool CXFA_FFComboBox::Paste(const WideString& wsPaste) { -- cgit v1.2.3