diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-25 15:27:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-27 17:00:59 +0100 |
| commit | b9405fbc4e19901c78d136895c5ab0437d8450ac (patch) | |
| tree | f42d180c9f6b4450959ff94d6f40a2ae881d8984 /editeng | |
| parent | Removed duplicated include (diff) | |
| download | core-b9405fbc4e19901c78d136895c5ab0437d8450ac.tar.gz core-b9405fbc4e19901c78d136895c5ab0437d8450ac.zip | |
Resolves: tdf#137620 add DeleteSurroundingText at vcl::Window level
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 <caolanm@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 11 | ||||
| -rw-r--r-- | editeng/source/outliner/outlvw.cxx | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 94012cf70651..3133126ba638 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1549,6 +1549,17 @@ Selection EditView::GetSurroundingTextSelection() const } } +bool EditView::DeleteSurroundingText(const Selection& rRange) +{ + ESelection aSel(GetSelection()); + aSel.nEndPara = aSel.nStartPara; + aSel.nStartPos = rRange.Min(); + aSel.nEndPos = rRange.Max(); + SetSelection(aSel); + DeleteSelected(); + return true; +} + void EditView::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool bClearMark) { Point aDocPos(pImpEditView->GetDocPos(rPosition)); diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 525559720eac..aff9992d8b4c 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1409,8 +1409,12 @@ Selection OutlinerView::GetSurroundingTextSelection() const return pEditView->GetSurroundingTextSelection(); } -// ===== some code for thesaurus sub menu within context menu +bool OutlinerView::DeleteSurroundingText(const Selection& rSelection) +{ + return pEditView->DeleteSurroundingText(rSelection); +} +// ===== some code for thesaurus sub menu within context menu namespace { |