[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Tamás Zolnai]

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

New commits:
commit 893c6e4007da093d2e954b5a0cb847f8d3d65d66
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Jul 1 14:48:22 2017 +0200

    tdf#107505: Impress - crash with two people co-editing one slide
    
    In tiledrendering mode cursor inside shapes are not handled very well now.
    Different LO instances manipulates the same cursor instead of having
    one separate cursor for all instances (as in case of simple text editing
    in Writer).
    
    Crashes caused by that one cursor is owned (created and destroyed) by one
    LO instance but used by an other instance in the meantime. We can avoid
    this by not making this cursor available to the other instances. Cursor is
    hidden anyway so don't need to have it set to the corresponding Window.
    
    Change-Id: Id78f79e73eda88f3c2c6aa7f534c32f3f8aba174
    Reviewed-on: https://gerrit.libreoffice.org/39432
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 258df6f41d89a606a980942df6337d446634c0a6)
    Reviewed-on: https://gerrit.libreoffice.org/39435
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f9aeb4ae1c1e..11fffc5c8a38 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -909,6 +909,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
                             {
                                 OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), nullptr);
                                 pOutlView->HideCursor();
+                                static_cast<vcl::Window*>(&rOutDev)->SetCursor(nullptr);
                                 pTextEditOutliner->InsertView(pOutlView);
                             }
                         }