commit 0750be852e865c6c5f6f26365064126c10770f31
author Caolán McNamara <caolanm@redhat.com> Wed Jan 23 10:25:04 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Jan 23 13:01:28 2019 +0100
tree 3f1d7845cbb27bb84d73dee99034821362b85583
parent c166dc34404ef25c583b52912f80eedc9cfcf38f

Resolves: tdf#122889 Mail config dialog is empty

revert...

commit 7ec12ce7e449d7849b3e67c443783110e2a50a17
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Fri Sep 28 20:24:35 2018 +0100

    weld SwMailConfigDlg

the contained page needs to be converted first

Change-Id: I9788132b0ad11cec853be7339be1829386794511
Reviewed-on: https://gerrit.libreoffice.org/66781
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/config/mailconfigpage.cxx

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index caf1759..3d3090c 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -373,12 +373,11 @@ void SwTestAccountSettingsDialog::Test()
    }
}

SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet)
    : SfxSingleTabDialogController(pParent, rSet)
SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet)
    : SfxSingleTabDialog(pParent, rSet)
{
    TabPageParent pPageParent(get_content_area(), this);
    // create TabPage
    SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet));
    SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet));
}

SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(

sw/source/ui/dbui/mmresultdialogs.cxx

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index dfde8164..a103d40 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -850,8 +850,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
        {
            SwView* pConfigView = pTargetView ? pTargetView : pView;
            SfxAllItemSet aSet(pConfigView->GetPool());
            SwMailConfigDlg aDlg(m_xDialog.get(), aSet);
            nRet = aDlg.run();
            ScopedVclPtrInstance<SwMailConfigDlg> pDlg(nullptr, aSet);
            nRet = pDlg->Execute();
        }

        if(nRet != RET_OK && nRet != RET_YES)

sw/source/uibase/inc/mailconfigpage.hxx

diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 739ae22..a02ca32 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -67,10 +67,10 @@ public:

};

class SwMailConfigDlg : public SfxSingleTabDialogController
class SwMailConfigDlg : public SfxSingleTabDialog
{
public:
    SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet);
    SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet);
};

#endif