IFWL method and param cleanup

xfa/fwl/core/ifwl_combobox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/ifwl_combobox.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/cfde_txtedtengine.h"
@@ skipping 268 matching lines @@
 int32_t IFWL_ComboBox::GetEditTextLength() const {
   if (!m_pEdit)
     return -1;
   return m_pEdit->GetTextLength();
 }
 
 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);
     CFWL_ListItem* hItem = pData->GetItem(this, m_iCurSel);
     m_pListBox->GetItemText(hItem, wsText);
     return FWL_Error::Succeeded;
   }
   return FWL_Error::Indefinite;
 }
 
 FWL_Error IFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
@@ skipping 12 matching lines @@
 
 int32_t IFWL_ComboBox::GetEditLimit() {
   if (!m_pEdit)
     return -1;
   return m_pEdit->GetLimit();
 }
 
 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) {
   return m_pEdit && m_pEdit->Redo(pRecord);
 }
 
 bool IFWL_ComboBox::EditUndo(const IFDE_TxtEdtDoRecord* pRecord) {
   return m_pEdit && m_pEdit->Undo(pRecord);
 }
 
@@ skipping 55 matching lines @@
 
 bool IFWL_ComboBox::EditCut(CFX_WideString& wsCut) {
   return m_pEdit->Cut(wsCut);
 }
 
 bool IFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) {
   return m_pEdit->Paste(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_combobox.h file. This was just
needed due to the changes to IFWL_Edit.

 }
 
 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) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_GetBBox(rect);
   }
   rect = m_pProperties->m_rtWidget;
   if (m_pListBox && IsDropListShowed()) {
     CFX_RectF rtList;
     m_pListBox->GetWidgetRect(rtList);
@@ skipping 828 matching lines @@
       else
         iCurSel++;
     }
     m_iCurSel = iCurSel;
     SynchrEditText(m_iCurSel);
     return;
   }
   if (m_pEdit)
     m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
 }