diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-04-28 22:16:27 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-04-29 20:27:47 +0200 |
| commit | f17742141e3f5657996f2f82f7b7642e81615b7f (patch) | |
| tree | a56fd0ed1919610d28799d0542e4841fbd12c3dc | |
| parent | 08fe3b0f1c1e72f15db1cd70d85effa3d63db276 (diff) | |
tdf#107505: Impress - crash with two people co-editing one slide
Deleting outliner view removes the pointed Cursor (pTECursorMerker).
Change-Id: Iac17386d1d02bf52bd5322073e49da05c6e89d9b
Reviewed-on: https://gerrit.libreoffice.org/37085
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 44555103217df34b218787f3dc6a2634b41fe52e)
Reviewed-on: https://gerrit.libreoffice.org/37094
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index b413f51e34e0..9a55be46c27e 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1228,7 +1228,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) // and now the Outliner itself if (!bTextEditDontDelete) delete pTEOutliner; else pTEOutliner->Clear(); - if (pTEWin!=nullptr) { + if (bTextEditDontDelete && pTEWin!=nullptr) { pTEWin->SetCursor(pTECursorMerker); } maHdlList.SetMoveOutside(false); |