diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-01-24 19:13:46 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-01-24 20:48:43 +0100 |
| commit | 3db822127e5bdf32eb9bd951c5d75f9492c5a09f (patch) | |
| tree | f3006fe261575bdd7a5a31874a3b7ad32f37d749 /sd | |
| parent | 0e3441faba4c830a24036ada2c596c529c992e58 (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/48532
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd')
| -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 fa6c773b434c..da77b647a84d 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 7e804262cc98..046d2f4387f8 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 a9e05c9346df..2ed5bdd8ac7d 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> @@ -120,7 +121,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 ); @@ -134,7 +135,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) |