diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 14:54:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-29 06:27:33 +0200 |
| commit | bbeeedbbfa0b7a0d1461c5ff703721bce1b7f80a (patch) | |
| tree | 07f0c7f5190a1a6d9393a1447ab9aef66f825f06 /sw/source/ui/dialog | |
| parent | 6f070fb228d0c6f05c48386d0f3538c89cfbc878 (diff) | |
weld SwNumFormatDlg
Change-Id: I8f7acf1b662d2357f810ff3c103670df2e58757f
Reviewed-on: https://gerrit.libreoffice.org/61089
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dialog')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 2a5849a1753e..5e1c01acdacc 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -770,11 +770,9 @@ VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwBackgroundDialog return VclPtr<SwAbstractSfxController_Impl>::Create(o3tl::make_unique<SwBackgroundDlg>(pParent, rSet)); } -VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateNumFormatDialog( vcl::Window* pParent, - const SfxItemSet& rSet) +VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateNumFormatDialog(weld::Window* pParent, const SfxItemSet& rSet) { - VclPtr<SfxModalDialog> pDlg = VclPtr<SwNumFormatDlg>::Create( pParent, rSet ); - return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg ); + return VclPtr<SwAbstractSfxController_Impl>::Create(o3tl::make_unique<SwNumFormatDlg>(pParent, rSet)); } VclPtr<AbstractSwAsciiFilterDlg> SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(weld::Window* pParent, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 7cbb22347371..2ad87e1986dc 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -573,7 +573,7 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory public: virtual ~SwAbstractDialogFactory_Impl() {} - virtual VclPtr<SfxAbstractDialog> CreateNumFormatDialog(vcl::Window* pParent, const SfxItemSet& rAttr) override; + virtual VclPtr<SfxAbstractDialog> CreateNumFormatDialog(weld::Window* pParent, const SfxItemSet& rAttr) override; virtual VclPtr<SfxAbstractDialog> CreateSwDropCapsDialog(weld::Window* pParent, const SfxItemSet& rSet) override; virtual VclPtr<SfxAbstractDialog> CreateSwBackgroundDialog(weld::Window* pParent, const SfxItemSet& rSet) override; virtual VclPtr<AbstractSwWordCountFloatDlg> CreateSwWordCountDialog(SfxBindings* pBindings, |