diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-31 16:57:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-02 15:29:33 +0200 |
| commit | c26134c4027dfac6be030c467da40a495a162360 (patch) | |
| tree | ed401289a7418dd462e8d082d5779257d4b8d81a /sw/source/uibase | |
| parent | 2d815d9cd5ea7bbae103e4e8b211b5d1858fff00 (diff) | |
merge SvxStandardDialog and SwMailMergeDlg
Change-Id: If4ee4e09f5549ef347c7e97b1c2e68b3971b8b19
Reviewed-on: https://gerrit.libreoffice.org/73284
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/mailmrge.hxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 2930f9f908ba..fb8773a3a602 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -47,18 +47,7 @@ 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 +class SwMailMergeDlg : public SfxModalDialog { friend class SwXSelChgLstnr_Impl; @@ -122,7 +111,6 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK( ModifyHdl, Edit&, void ); DECL_LINK( SaveTypeHdl, Button*, void ); - virtual void Apply() override; bool ExecQryShell(); bool AskUserFilename() const; OUString GetURLfromPath() const; |