diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-03 17:24:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-03 22:13:26 +0100 |
| commit | 1d9c7ec1f1bfe527fe83edb6afd3c924d0243328 (patch) | |
| tree | 911f5ca86738f366e069f1bc467d566577375788 /cui/source/factory | |
| parent | def5287c1e77bce18d9a403527c23d754a1ada33 (diff) | |
weld SvxMacroAssignDlg
and SvxEventConfigPage, SvxMacroTabPage_, SvxMacroTabPage
Change-Id: I98a2e71794f098015927dc7cd7ec4e258f56e703
Reviewed-on: https://gerrit.libreoffice.org/68649
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 | 23 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 |
2 files changed, 6 insertions, 19 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f1258eaecd57..11ee06af964d 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1372,41 +1372,28 @@ VclPtr<AbstractSvxPostItDialog> AbstractDialogFactory_Impl::CreateSvxPostItDialo class SvxMacroAssignDialog : public VclAbstractDialog { public: - SvxMacroAssignDialog( vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + SvxMacroAssignDialog( weld::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) :m_aItems( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM>{} ) { m_aItems.Put( SfxBoolItem( SID_ATTR_MACROITEM, _bUnoDialogMode ) ); - m_pDialog.reset( VclPtr<SvxMacroAssignDlg>::Create( _pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent ) ); + m_xDialog.reset(new SvxMacroAssignDlg(_pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent)); } virtual short Execute() override; - virtual ~SvxMacroAssignDialog() override; - virtual void dispose() override; private: SfxItemSet m_aItems; - VclPtr<SvxMacroAssignDlg > m_pDialog; + std::unique_ptr<SvxMacroAssignDlg> m_xDialog; }; short SvxMacroAssignDialog::Execute() { - return m_pDialog->Execute(); -} - -SvxMacroAssignDialog::~SvxMacroAssignDialog() -{ - disposeOnce(); -} - -void SvxMacroAssignDialog::dispose() -{ - m_pDialog.clear(); - VclAbstractDialog::dispose(); + return m_xDialog->run(); } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg( - vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + weld::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) { return VclPtr<SvxMacroAssignDialog>::Create( _pParent, _rxDocumentFrame, _bUnoDialogMode, _rxEvents, _nInitiallySelectedEvent ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 0099a726f30c..ea21cfd90575 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -821,7 +821,7 @@ public: virtual VclPtr<VclAbstractDialog> CreateScriptErrorDialog(const css::uno::Any& rException) override; virtual VclPtr<VclAbstractDialog> CreateSvxMacroAssignDlg( - vcl::Window* _pParent, + weld::Window* _pParent, const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const css::uno::Reference< css::container::XNameReplace >& _rxEvents, |