[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/config/mailconfigpage.cxx |   10 +++-------
 sw/source/ui/inc/mailconfigpage.hxx    |    6 ++----
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 29d5cb9af0fa513ebf6c703e67b34e600100ef46
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 8 12:17:31 2013 +0100

    SwMailConfigDlg can now be converted to SfxSingleTabDialog
    
    Change-Id: Ic9895e027be8b5406dda7756a19127bd4edee63d

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c5379dd..3467a18 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -409,15 +409,11 @@ void SwTestAccountSettingsDialog::Test()
     }
 }
 
-SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet ) :
-    SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
+SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet)
+    : SfxSingleTabDialog(pParent, rSet)
 {
     // create TabPage
-    SetTabPage(SwMailConfigPage::Create( this, rSet ));
-}
-
-SwMailConfigDlg::~SwMailConfigDlg()
-{
+    setTabPage(SwMailConfigPage::Create(get_content_area(), rSet));
 }
 
 SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx
index 2329291..ab5d3a5 100644
--- a/sw/source/ui/inc/mailconfigpage.hxx
+++ b/sw/source/ui/inc/mailconfigpage.hxx
@@ -67,12 +67,10 @@ public:
 
 };
 
-class SwMailConfigDlg : public SfxNoLayoutSingleTabDialog
+class SwMailConfigDlg : public SfxSingleTabDialog
 {
 public:
-
-    SwMailConfigDlg( Window* pParent, SfxItemSet& rSet );
-    ~SwMailConfigDlg();
+    SwMailConfigDlg(Window* pParent, SfxItemSet& rSet);
 };
 
 #endif