diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-06 15:00:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-06 20:50:22 +0100 |
| commit | 913b2530fff20bacb0cbb8e51be29b42983d56c8 (patch) | |
| tree | a2ed349d04099e07d77e2c6307e48896ecc78eac /sd | |
| parent | ef0e7e146f86999b04d7274688d72fadcaf53a36 (diff) | |
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/82143
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index c8bfd0d26cb0..1760454d5fe9 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -644,15 +644,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() ) { |