[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - svx/source

[Tamás Zolnai]

 svx/source/svdraw/svdedxv.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61d5a42cf4c65a9da38b91d33a98ea46d4b4d1ea
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Fri Apr 28 22:16:27 2017 +0200

    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 at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 44555103217df34b218787f3dc6a2634b41fe52e)
    Reviewed-on: https://gerrit.libreoffice.org/37097
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

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);