From 8adc153ea6fe778d19dc33cd2c5b87aed312b29b Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 13 May 2016 15:19:22 -0700 Subject: ReplaceSelections() methods never called. Review-Url: https://codereview.chromium.org/1973883005 --- xfa/fwl/basewidget/fwl_editimp.cpp | 16 ---------------- xfa/fwl/basewidget/fwl_editimp.h | 1 - xfa/fwl/basewidget/ifwl_edit.h | 1 - xfa/fwl/lightwidget/cfwl_edit.cpp | 6 ------ xfa/fwl/lightwidget/cfwl_edit.h | 1 - 5 files changed, 25 deletions(-) diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 9f80336efa..083a0885f7 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -127,9 +127,6 @@ FWL_Error IFWL_Edit::DeleteSelections() { FWL_Error IFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount) { return static_cast(GetImpl())->DeleteRange(nStart, nCount); } -FWL_Error IFWL_Edit::ReplaceSelections(const CFX_WideStringC& wsReplace) { - return static_cast(GetImpl())->ReplaceSelections(wsReplace); -} FWL_Error IFWL_Edit::Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace) { @@ -664,19 +661,6 @@ FWL_Error CFWL_EditImp::DeleteRange(int32_t nStart, int32_t nCount) { return FWL_Error::Succeeded; } -FWL_Error CFWL_EditImp::ReplaceSelections(const CFX_WideStringC& wsReplace) { - if (!m_pEdtEngine) - return FWL_Error::Indefinite; - - int32_t iCount = m_pEdtEngine->CountSelRanges(); - for (int i = 0; i < iCount; i++) { - int32_t nStart; - int32_t nCount = m_pEdtEngine->GetSelRange(i, nStart); - m_pEdtEngine->Replace(nStart, nCount, wsReplace); - } - return FWL_Error::Succeeded; -} - FWL_Error CFWL_EditImp::Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace) { diff --git a/xfa/fwl/basewidget/fwl_editimp.h b/xfa/fwl/basewidget/fwl_editimp.h index 168726da1e..9c0853b4fd 100644 --- a/xfa/fwl/basewidget/fwl_editimp.h +++ b/xfa/fwl/basewidget/fwl_editimp.h @@ -63,7 +63,6 @@ class CFWL_EditImp : public CFWL_WidgetImp { int32_t nLen); virtual FWL_Error DeleteSelections(); virtual FWL_Error DeleteRange(int32_t nStart, int32_t nCount = -1); - virtual FWL_Error ReplaceSelections(const CFX_WideStringC& wsReplace); virtual FWL_Error Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace); diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index 6260ce80b6..5650bce4dc 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -120,7 +120,6 @@ class IFWL_Edit : public IFWL_Widget { FWL_Error Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); FWL_Error DeleteSelections(); FWL_Error DeleteRange(int32_t nStart, int32_t nCount = -1); - FWL_Error ReplaceSelections(const CFX_WideStringC& wsReplace); FWL_Error Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace); diff --git a/xfa/fwl/lightwidget/cfwl_edit.cpp b/xfa/fwl/lightwidget/cfwl_edit.cpp index 0303e6c2a2..f151edd7e9 100644 --- a/xfa/fwl/lightwidget/cfwl_edit.cpp +++ b/xfa/fwl/lightwidget/cfwl_edit.cpp @@ -140,12 +140,6 @@ FWL_Error CFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount) { return static_cast(m_pIface)->DeleteRange(nStart, nCount); } -FWL_Error CFWL_Edit::ReplaceSelections(const CFX_WideStringC& wsReplace) { - if (!m_pIface) - return FWL_Error::Indefinite; - return static_cast(m_pIface)->ReplaceSelections(wsReplace); -} - FWL_Error CFWL_Edit::Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace) { diff --git a/xfa/fwl/lightwidget/cfwl_edit.h b/xfa/fwl/lightwidget/cfwl_edit.h index 5f3e045535..c7001a3166 100644 --- a/xfa/fwl/lightwidget/cfwl_edit.h +++ b/xfa/fwl/lightwidget/cfwl_edit.h @@ -36,7 +36,6 @@ class CFWL_Edit : public CFWL_Widget { FWL_Error Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); FWL_Error DeleteSelections(); FWL_Error DeleteRange(int32_t nStart, int32_t nCount = -1); - FWL_Error ReplaceSelections(const CFX_WideStringC& wsReplace); FWL_Error Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC& wsReplace); -- cgit v1.2.3