From 7ec12ce7e449d7849b3e67c443783110e2a50a17 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 28 Sep 2018 20:24:35 +0100
Subject: weld SwMailConfigDlg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6295eeb6938f654967d2fbfc86acd90b18d9d16e
Reviewed-on: https://gerrit.libreoffice.org/61107
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  | 7 ++++---
 sw/source/ui/dbui/mmresultdialogs.cxx   | 4 ++--
 sw/source/uibase/inc/mailconfigpage.hxx | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 7d73d5e1c669..84a55e3e2d71 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -373,11 +373,12 @@ void SwTestAccountSettingsDialog::Test()
     }
 }
 
-SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet)
-    : SfxSingleTabDialog(pParent, rSet)
+SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet)
+    : SfxSingleTabDialogController(pParent, rSet)
 {
+    TabPageParent pPageParent(get_content_area(), this);
     // create TabPage
-    SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet));
+    SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet));
 }
 
 SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index f8a9ed00178c..e54ba944f16c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -884,8 +884,8 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
         {
             SwView* pConfigView = pTargetView ? pTargetView : pView;
             SfxAllItemSet aSet(pConfigView->GetPool());
-            ScopedVclPtrInstance< SwMailConfigDlg > pDlg(pButton, aSet);
-            nRet = pDlg->Execute();
+            SwMailConfigDlg aDlg(pButton->GetFrameWeld(), aSet);
+            nRet = aDlg.run();
         }
 
         if(nRet != RET_OK && nRet != RET_YES)
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 697bebb26827..0108662a5bcb 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -68,10 +68,10 @@ public:
 
 };
 
-class SwMailConfigDlg : public SfxSingleTabDialog
+class SwMailConfigDlg : public SfxSingleTabDialogController
 {
 public:
-    SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet);
+    SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet);
 };
 
 #endif
-- 
cgit