summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-04-28 22:16:27 +0200
committerJan Holesovsky <kendy@collabora.com>2017-05-02 19:31:24 +0200
commit61d5a42cf4c65a9da38b91d33a98ea46d4b4d1ea (patch)
tree9ec2800245a351c233df83debe1c79a911d48502 /svx
parenta70c34ccf5c446967bf9a258b8da2bd7addc9695 (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/37097 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
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);