diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-12 18:37:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-13 09:53:32 +0100 |
| commit | 0faf4e5c2e98219b17e042594710f6872bf6a615 (patch) | |
| tree | 618ec137e00e30bbf6ab25d33374c8d20576853d /cui/source/factory | |
| parent | fdc44bd929f038182dda4ea951f3b70dfc67f8d1 (diff) | |
weld DatabaseRegistrationDialog
Change-Id: I739785daef892ac16d2a41a98268f18670daeedb
Reviewed-on: https://gerrit.libreoffice.org/69136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/factory')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 25 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 |
2 files changed, 8 insertions, 19 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index b155a8685b9a..91b3e943621b 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1304,35 +1304,24 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateEventConfigDialog(we return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SfxMacroAssignDlg>(pParent, _rxDocumentFrame, rAttr)); } -VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Window* pParent, +VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(weld::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId) { - SfxSingleTabDialog* pDlg=nullptr; switch ( nResId ) { - case RID_SVXPAGE_MEASURE : - { - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxMeasureDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); - } - case RID_SVXPAGE_CONNECTION : - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxConnectionDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); - - case RID_SFXPAGE_DBREGISTER : - pDlg = VclPtr<DatabaseRegistrationDialog>::Create( pParent, rAttr ); - break; - default: - break; + case RID_SVXPAGE_MEASURE: + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxMeasureDialog>(pParent, rAttr, pView)); + case RID_SVXPAGE_CONNECTION: + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxConnectionDialog>(pParent, rAttr, pView)); + case RID_SFXPAGE_DBREGISTER: + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<DatabaseRegistrationDialog>(pParent, rAttr)); } - if ( pDlg ) - return VclPtr<CuiAbstractSfxDialog_Impl>::Create( pDlg ); - return nullptr; } - VclPtr<AbstractSvxPostItDialog> AbstractDialogFactory_Impl::CreateSvxPostItDialog( weld::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext ) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 44ad834a3b50..83e156abbf97 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -667,7 +667,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory public: virtual VclPtr<VclAbstractDialog> CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) override; - virtual VclPtr<SfxAbstractDialog> CreateSfxDialog( vcl::Window* pParent, + virtual VclPtr<SfxAbstractDialog> CreateSfxDialog( weld::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ) override; |