diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 14:24:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 21:31:17 +0100 |
| commit | 6dc1087b37a9ce5bc9b728d6a23fef69a66bb3d2 (patch) | |
| tree | 0f774f9b0d4b80db2ca6367d9bc9e22dbf3a5c09 | |
| parent | 945c10f42fe6d22031e7424b47481ac2cfb539be (diff) | |
tdf#113647 set parent for modal gallery dialog
Change-Id: I1de801eefba135819aee992ffce826309c1c7400
Reviewed-on: https://gerrit.libreoffice.org/44550
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 4 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svxdlg.hxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 33c39a69f7bb..ca9fb47b02b6 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1005,11 +1005,11 @@ VclPtr<AbstractGalleryIdDialog> AbstractDialogFactory_Impl::CreateGalleryIdDialo return VclPtr<AbstractGalleryIdDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog2> AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( +VclPtr<VclAbstractDialog2> AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) { - VclPtrInstance<GalleryThemeProperties> pDlg( nullptr, pData, pItemSet); + VclPtrInstance<GalleryThemeProperties> pDlg(pParent, pData, pItemSet); return VclPtr<VclAbstractDialog2_Impl>::Create( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 589478a1135e..e9d61e3bcf93 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -531,7 +531,7 @@ public: const OUString& rOldText) override; virtual VclPtr<AbstractGalleryIdDialog> CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm) override; - virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog( + virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) override; virtual VclPtr<AbstractURLDlg> CreateURLDialog( vcl::Window* pParent, diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 547cd76276cb..63b1190df9a5 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -357,7 +357,7 @@ public: const OUString& rOldText ) = 0; virtual VclPtr<AbstractGalleryIdDialog> CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog( + virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet ) = 0; virtual VclPtr<AbstractURLDlg> CreateURLDialog( vcl::Window* pParent, diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 447c26dd7c72..1cb871967e51 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -265,7 +265,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); assert(pFact && "Got no AbstractDialogFactory!"); - mpThemePropertiesDialog = pFact->CreateGalleryThemePropertiesDialog( mpExchangeData, mpThemePropsDlgItemSet ); + mpThemePropertiesDialog = pFact->CreateGalleryThemePropertiesDialog(this, mpExchangeData, mpThemePropsDlgItemSet); assert(mpThemePropertiesDialog && "Got no GalleryThemePropertiesDialog!"); if ( bCreateNew ) |