diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-31 16:52:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-01 22:45:50 +0200 |
| commit | 88f48b51f3cf25c78db278499d46d4913ab442ed (patch) | |
| tree | 3722c153fd87e168ebef975578f8bc726d39c007 /sw | |
| parent | a7862a61deb8e85d835f6a9c620747c3bb4d36f4 (diff) | |
move SvxStandardDialog to last consumer
Change-Id: I02638b5a1a3c7a27c19320fedd291bbcb17bb9dc
Reviewed-on: https://gerrit.libreoffice.org/73283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 14 | ||||
| -rw-r--r-- | sw/source/uibase/inc/mailmrge.hxx | 13 |
2 files changed, 26 insertions, 1 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index e7769feb7c14..7072502c095c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -118,6 +118,20 @@ void SwXSelChgLstnr_Impl::disposing( const EventObject& ) OSL_FAIL("disposing"); } +short SvxStandardDialog::Execute() +{ + short nRet = ModalDialog::Execute(); + + if ( RET_OK == nRet ) + Apply(); + return nRet; +} + +SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription ) + : SfxModalDialog(pParent, rID, rUIXMLDescription) +{ +} + SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, const OUString& rSourceName, const OUString& rTableName, diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index cbb9a9465936..2930f9f908ba 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX #include <memory> -#include <svx/stddlg.hxx> +#include <sfx2/basedlgs.hxx> #include <vcl/button.hxx> @@ -47,6 +47,17 @@ namespace com{namespace sun{namespace star{ } }}} +class SvxStandardDialog : public SfxModalDialog +{ +public: + SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); + + short Execute() override; + +protected: + virtual void Apply() = 0; +}; + class SwMailMergeDlg : public SvxStandardDialog { friend class SwXSelChgLstnr_Impl; |