summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-07-01 14:48:22 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-07-07 13:48:55 +0200
commit664c910653239a4d28036b79a8e396bebed1727b (patch)
treeaad53edf9fe99993dd0d9872b830fb4efdf240ce /svx
parent6a3960044c609b682170f7a34612761e62746c98 (diff)
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@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 258df6f41d89a606a980942df6337d446634c0a6) Reviewed-on: https://gerrit.libreoffice.org/39436 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedxv.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b9ac36ccac22..4159b61fe656 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -913,6 +913,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
{
OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), !bEmpty, nullptr);
pOutlView->HideCursor();
+ static_cast<vcl::Window*>(&rOutDev)->SetCursor(nullptr);
pTextEditOutliner->InsertView(pOutlView);
}
}