[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/envelp/mailmrge.cxx  |   22 ++--------------------
 sw/source/uibase/inc/mailmrge.hxx |   14 +-------------
 2 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 87bd93779380ea2bc31c369aca584791b3f4d352
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 31 16:57:12 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jun 2 15:33:09 2019 +0200

    merge SvxStandardDialog and SwMailMergeDlg
    
    Change-Id: If4ee4e09f5549ef347c7e97b1c2e68b3971b8b19
    Reviewed-on: https://gerrit.libreoffice.org/73284
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit c26134c4027dfac6be030c467da40a495a162360)
    Reviewed-on: https://gerrit.libreoffice.org/73335

diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 7072502c095c..6c3f91d59f4f 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -118,20 +118,6 @@ 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,
@@ -139,7 +125,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell,
                                const uno::Reference< XConnection>& _xConnection,
                                Sequence< Any > const * pSelection) :
 
-    SvxStandardDialog(pParent, "MailmergeDialog", "modules/swriter/ui/mailmerge.ui"),
+    SfxModalDialog(pParent, "MailmergeDialog", "modules/swriter/ui/mailmerge.ui"),
 
     pImpl           (new SwMailMergeDlg_Impl),
 
@@ -420,11 +406,7 @@ void SwMailMergeDlg::dispose()
     m_pFormatRtfCB.clear();
     m_pFormatSwCB.clear();
     m_pOkBTN.clear();
-    SvxStandardDialog::dispose();
-}
-
-void SwMailMergeDlg::Apply()
-{
+    SfxModalDialog::dispose();
 }
 
 IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void )
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;