Index: xfa/fwl/core/ifwl_combobox.cpp |
diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp |
index b0fc9a3a980a541c8fc17b74aa2ba039e52d932d..a964a5b1b8431034a22359e3093de9b12dfbb5dc 100644 |
--- a/xfa/fwl/core/ifwl_combobox.cpp |
+++ b/xfa/fwl/core/ifwl_combobox.cpp |
@@ -286,7 +286,8 @@ FWL_Error IFWL_ComboBox::GetEditText(CFX_WideString& wsText, |
int32_t nStart, |
int32_t nCount) const { |
if (m_pEdit) { |
- return m_pEdit->GetText(wsText, nStart, nCount); |
+ m_pEdit->GetText(wsText, nStart, nCount); |
+ return FWL_Error::Succeeded; |
} else if (m_pListBox) { |
Tom Sepez
2016/11/10 17:00:25
nit: else after return.
dsinclair
2016/11/10 17:22:39
Will get in a formatting followup.
|
IFWL_ComboBoxDP* pData = |
static_cast<IFWL_ComboBoxDP*>(m_pProperties->m_pDataProvider); |
@@ -320,13 +321,8 @@ int32_t IFWL_ComboBox::GetEditLimit() { |
FWL_Error IFWL_ComboBox::SetEditLimit(int32_t nLimit) { |
if (!m_pEdit) |
return FWL_Error::Indefinite; |
- return m_pEdit->SetLimit(nLimit); |
-} |
- |
-FWL_Error IFWL_ComboBox::EditDoClipboard(int32_t iCmd) { |
- if (!m_pEdit) |
- return FWL_Error::Indefinite; |
- return m_pEdit->DoClipboard(iCmd); |
+ m_pEdit->SetLimit(nLimit); |
+ return FWL_Error::Succeeded; |
} |
bool IFWL_ComboBox::EditRedo(const IFDE_TxtEdtDoRecord* pRecord) { |
@@ -402,15 +398,18 @@ bool IFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) { |
} |
bool IFWL_ComboBox::EditSelectAll() { |
- return m_pEdit->AddSelRange(0) == FWL_Error::Succeeded; |
+ m_pEdit->AddSelRange(0); |
+ return true; |
npm
2016/11/09 23:41:26
Nit: make these three void as well.
dsinclair
2016/11/10 01:15:29
Will do that when I do the rest of the ifwl_combob
|
} |
bool IFWL_ComboBox::EditDelete() { |
- return m_pEdit->ClearText() == FWL_Error::Succeeded; |
+ m_pEdit->ClearText(); |
+ return true; |
} |
bool IFWL_ComboBox::EditDeSelect() { |
- return m_pEdit->ClearSelections() == FWL_Error::Succeeded; |
+ m_pEdit->ClearSelections(); |
+ return true; |
} |
FWL_Error IFWL_ComboBox::GetBBox(CFX_RectF& rect) { |