diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-07-02 00:01:01 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-03 12:36:16 +0200 |
| commit | 1aa93766ee3994af9975e96e8ea60e02078de2d8 (patch) | |
| tree | eaf6510a0712f7975333d2840fc6d3b27445a6bc /sd | |
| parent | 22d98585cf8f9b2b8fb1ef915978e07422141c2b (diff) | |
tdf#126180: EndTextEdit on all views before delete/cut slide
This also reworks the fixes tdf#125824 and tdf#111522 to use EndTextEdit
instead of blocking the undoing
Change-Id: I73c2289a9d950465f020f684e9e736148380f5c5
Reviewed-on: https://gerrit.libreoffice.org/74989
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit e6c7a018a0cfee395ce2886d41c908a2447ef5cc)
Reviewed-on: https://gerrit.libreoffice.org/75027
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 55b58e197f1c..17b4adeeb958 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -234,6 +234,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) // (DEL -> accelerator -> SID_CUT). if (mrSlideSorter.GetModel().GetPageCount() > 1) { + mrSlideSorter.GetView().EndTextEditAllViews(); mrSlideSorter.GetController().GetSelectionManager()->DeleteSelectedPages(); } @@ -371,6 +372,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) case SID_CUT: case SID_COPY: case SID_DELETE: + mrSlideSorter.GetView().EndTextEditAllViews(); mrSlideSorter.GetController().GetClipboard().HandleSlotCall(rRequest); break; |