diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-01-24 19:13:46 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-25 10:08:39 +0100 |
| commit | 7616b3dd942efad8fa20b30ab3a0833a21501ffd (patch) | |
| tree | ebfc7dbdcffc756d47c9a704745b9f9f9a6c4191 /sd/source/ui | |
| parent | 5fc484a786a04d65811518b7effab66925dcec72 (diff) | |
lokdialog: Parents for the Impress async dialogs.
After 072e3ce1cfea5bb61cc5f3001c288df6deb45613, the dialogs must have parents,
otherwise the LOK notification does not work for them.
Change-Id: I46774d05a7d47adaaa0e06104541e47daf68f3db
Reviewed-on: https://gerrit.libreoffice.org/48533
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/func/fuarea.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuline.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/futransf.cxx | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 042de7aa239f..29d8cb5311a3 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -65,7 +65,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( aNewAttr ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog(nullptr, &aNewAttr, mpDoc, true) : nullptr); + VclPtr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog(mpViewShell->GetActiveWindow(), &aNewAttr, mpDoc, true) : nullptr); if (!pDlg) { mpViewShell->Cancel(); diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 9fa501ce52c4..d4511fdcc610 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -79,7 +79,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) bool bHasMarked = mpView->AreObjectsMarked(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - VclPtr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(nullptr,pNewAttr.get(),mpDoc,pObj,bHasMarked) : nullptr); + VclPtr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(mpViewShell->GetActiveWindow(), pNewAttr.get(), mpDoc, pObj, bHasMarked) : nullptr); if (!pDlg) { mpViewShell->Cancel(); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 9dddef1dde4b..ef2894cc37f5 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -27,6 +27,7 @@ #include <strings.hrc> #include <ViewShell.hxx> #include <View.hxx> +#include <Window.hxx> #include <sdresid.hxx> #include <drawdoc.hxx> #include <svx/svxdlg.hxx> @@ -101,7 +102,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) if (!pFact) return; - pDlg.reset(pFact->CreateCaptionDialog(nullptr, mpView)); + pDlg.reset(pFact->CreateCaptionDialog(mpViewShell->GetActiveWindow(), mpView)); const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -115,7 +116,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) if (!pFact) return; - pDlg.reset(pFact->CreateSvxTransformTabDialog(nullptr, &aSet, mpView)); + pDlg.reset(pFact->CreateSvxTransformTabDialog(mpViewShell->GetActiveWindow(), &aSet, mpView)); } if (!pDlg) |