summaryrefslogtreecommitdiff
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-01 17:10:39 +0200
commit258df6f41d89a606a980942df6337d446634c0a6 (patch)
treec89f800fa862e79680eb49a61b32ed396fa64828
parent68c8d7faa219b36d5d17ca84f4f1002ec998b80c (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>
-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 cb7fa37892f1..04e3b34f8aff 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -908,6 +908,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);
}
}