From b9405fbc4e19901c78d136895c5ab0437d8450ac Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 25 Oct 2020 15:27:58 +0000 Subject: Resolves: tdf#137620 add DeleteSurroundingText at vcl::Window level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a) give it a default implementation based on the current one b) re-use code introduced for WeldEditView::DeleteSurroundingText for the EditView containing vcl::Window in impress/draw and various similar Annotation windows Change-Id: I55547c70e90ee394795b5545450cf8131538fad8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104781 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/source/dialog/weldeditview.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'svx/source') diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index c90b211cee23..f62a3df178dc 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -1448,18 +1448,9 @@ int WeldEditView::GetSurroundingText(OUString& rSurrounding) bool WeldEditView::DeleteSurroundingText(const Selection& rRange) { - bool bRes(false); - if (m_xEditView) - { - ESelection aSel(m_xEditView->GetSelection()); - aSel.nEndPara = aSel.nStartPara; - aSel.nStartPos = rRange.Min(); - aSel.nEndPos = rRange.Max(); - m_xEditView->SetSelection(aSel); - m_xEditView->DeleteSelected(); - bRes = true; - } - return bRes; + if (!m_xEditView) + return false; + return m_xEditView->DeleteSurroundingText(rRange); } void WeldEditView::GetFocus() -- cgit