From 3c80f4880d0d3a8f7c71d76877efe234f4f3629c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 1 Oct 2018 14:12:24 +0100 Subject: weld SvxLineTabDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icb13a6eb2e8c6f6dbd3cf477051bc0bd682e2e7a Reviewed-on: https://gerrit.libreoffice.org/61193 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/animations/CustomAnimationPane.cxx | 1 + sd/source/ui/func/fuline.cxx | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'sd/source') 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 pDlg( pFact->CreateSvxLineTabDialog(mpViewShell->GetActiveWindow(), pNewAttr.get(), mpDoc, pObj, bHasMarked) ); + VclPtr 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(); }); } -- cgit