diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-24 15:09:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-25 15:40:15 +0100 |
| commit | 3dacf98b70088e6435fb46c3e225bea35a451028 (patch) | |
| tree | a222c973d25f69b957bff6429c337809e766a530 /cui/source/factory | |
| parent | 3a713e78a03f8200668ce146b153e12384de5bee (diff) | |
weld SfxMacroAssignDlg
Change-Id: I80045f1d1ca189fc490dc88b3471d68782df6f1c
Reviewed-on: https://gerrit.libreoffice.org/63976
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 | 9 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ff95f66b2574..f2f09863a5c4 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1318,12 +1318,11 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateCharMapDialog(weld:: return VclPtr<AbstractSvxCharacterMapDialog_Impl>::Create(o3tl::make_unique<SvxCharacterMap>(pParent, &rAttr, bInsert)); } -VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateEventConfigDialog( vcl::Window* pParent, - const SfxItemSet& rAttr, - const Reference< XFrame >& _rxDocumentFrame) +VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateEventConfigDialog(weld::Window* pParent, + const SfxItemSet& rAttr, + const Reference< XFrame >& _rxDocumentFrame) { - SfxModalDialog* pDlg = VclPtr<SfxMacroAssignDlg>::Create(pParent, _rxDocumentFrame, rAttr); - return VclPtr<CuiAbstractSfxDialog_Impl>::Create(pDlg); + return VclPtr<CuiAbstractController_Impl>::Create(o3tl::make_unique<SfxMacroAssignDlg>(pParent, _rxDocumentFrame, rAttr)); } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index a662aa09ee07..0b1436f3c4d7 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -677,10 +677,9 @@ public: virtual VclPtr<SfxAbstractDialog> CreateCharMapDialog(weld::Window* pParent, const SfxItemSet& rAttr, bool bInsert) override; - virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog( vcl::Window* pParent, - const SfxItemSet& rAttr, - const css::uno::Reference< css::frame::XFrame >& _rxFrame - ) override; + virtual VclPtr<SfxAbstractDialog> CreateEventConfigDialog(weld::Window* pParent, + const SfxItemSet& rAttr, + const css::uno::Reference< css::frame::XFrame >& _rxFrame) override; virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) override; |