sd/source/ui/func/fudraw.cxx | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 6294a9cf96ea562cc6aac43cfc15761e1188a951
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 6 15:00:55 2019 +0000
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Thu Nov 7 10:58:13 2019 +0100
Resolves: tdf#128631 dispatch active ole async
like we do for the other things that might create dialogs
Change-Id: I31ca267526ddeac8d0c7163af45c11be7750cb4c
Reviewed-on: https://gerrit.libreoffice.org/82144
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 45a5629609bd..c2f141a85abe 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -686,15 +686,12 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2)
{
- DrawDocShell* pDocSh = mpDoc->GetDocSh();
-
- if ( !pDocSh->IsUIActive() )
- {
- /**********************************************************
- * activate OLE-object
- **********************************************************/
- mpViewShell->ActivateObject(
static_cast<SdrOle2Obj*>(pObj), 0);
- }
+ // activate OLE-object
+ SfxInt16Item aItem(SID_OBJECT, 0);
+ mpViewShell->GetViewFrame()->
+ GetDispatcher()->ExecuteList(SID_OBJECT,
+ SfxCallMode::ASYNCHRON |
SfxCallMode::RECORD,
+ { &aItem });
}
else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRAF
&& pObj->IsEmptyPresObj() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
