diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-01 14:12:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-02 09:58:41 +0200 |
| commit | 3c80f4880d0d3a8f7c71d76877efe234f4f3629c (patch) | |
| tree | efbb64a152e15c125a2ada453585c8d32b4725d6 /sd | |
| parent | 616fd241838069e18c59064e33c4b24f5ae112c6 (diff) | |
weld SvxLineTabDialog
Change-Id: Icb13a6eb2e8c6f6dbd3cf477051bc0bd682e2e7a
Reviewed-on: https://gerrit.libreoffice.org/61193
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/animations/CustomAnimationPane.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/func/fuline.cxx | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8277c4607802..418e006f3ff7 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1677,6 +1677,7 @@ void CustomAnimationPane::showOptions(const OString& sPage) changeSelection( pDlg->getResultSet(), pDlg->getPropertySet() ); updateControls(); } + pDlg->disposeOnce(); }); } diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 9735040321c3..819995a99d59 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -75,7 +75,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) bool bHasMarked = mpView->AreObjectsMarked(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSvxLineTabDialog(mpViewShell->GetActiveWindow(), pNewAttr.get(), mpDoc, pObj, bHasMarked) ); + VclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSvxLineTabDialog(mpViewShell->GetFrameWeld(), pNewAttr.get(), mpDoc, pObj, bHasMarked) ); pDlg->StartExecuteAsync([=](sal_Int32 nResult){ if (nResult == RET_OK) @@ -100,6 +100,8 @@ void FuLine::DoExecute( SfxRequest& rReq ) // deferred until the dialog ends mpViewShell->Cancel(); + + pDlg->disposeOnce(); }); } |