[Libreoffice-commits] core.git: svx/source

Tamás Zolnai tamas.zolnai at collabora.com
Fri Apr 28 22:39:39 UTC 2017


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

New commits:
commit 44555103217df34b218787f3dc6a2634b41fe52e
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>

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 54bfa83f492e..c49fd72c03af 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1224,7 +1224,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);


More information about the Libreoffice-commits mailing list