diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-29 09:32:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-29 21:50:35 +0200 |
| commit | eff752aec065d02a98693fff6c12092cb3c35176 (patch) | |
| tree | e98922dfc22eafbe9453a26e6eb1f631ec869abb /sd | |
| parent | efdc9425394e790c325644cd32f537341594f0b8 (diff) | |
weld SvxTransformTabDialog
Change-Id: Ib6dabd04e3f834b61363d5a620de7f0219a1e644
Reviewed-on: https://gerrit.libreoffice.org/55018
Tested-by: Jenkins <ci@libreoffice.org>
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/futransf.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 00193fe98bb9..28babc122354 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -81,6 +81,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SfxItemSet aSet( mpView->GetGeoAttrFromMarked() ); VclPtr<SfxAbstractTabDialog> pDlg; + bool bWelded = false; const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if( rMarkList.GetMarkCount() == 1 && @@ -109,7 +110,8 @@ void FuTransform::DoExecute( SfxRequest& rReq ) if (!pFact) return; - pDlg.reset(pFact->CreateSvxTransformTabDialog(mpViewShell->GetActiveWindow(), &aSet, mpView)); + pDlg.reset(pFact->CreateSvxTransformTabDialog(mpViewShell->GetFrameWeld(), &aSet, mpView)); + bWelded = true; } if (!pDlg) @@ -128,6 +130,8 @@ void FuTransform::DoExecute( SfxRequest& rReq ) // deferred until the dialog ends mpViewShell->Invalidate(SID_RULER_OBJECT); mpViewShell->Cancel(); + if (bWelded) + pDlg->disposeOnce(); }); } |