[Libreoffice-commits] .: sfx2/inc sfx2/source

[Libreoffice Gerrit user]

 sfx2/inc/sfx2/basedlgs.hxx      |    8 +++++---
 sfx2/source/dialog/basedlgs.cxx |    6 +-----
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 04f21f9ad6c4b5be606f3c62fd10b3f1c2df283a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 24 12:53:52 2013 +0000

    SingleTabDlgImpl::m_pTabPage never used
    
    Change-Id: I958fb2a42f8cc0ed87a98c68a303c8d6d6195079

diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 2d3abba..d532f3c 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -153,14 +153,16 @@ public:
 
 struct SingleTabDlgImpl
 {
-    TabPage*                    m_pTabPage;
     SfxTabPage*                 m_pSfxPage;
     FixedLine*                  m_pLine;
     String                      m_sInfoURL;
     Link                        m_aInfoLink;
 
-    SingleTabDlgImpl() :
-        m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ) {}
+    SingleTabDlgImpl()
+        : m_pSfxPage(NULL)
+        , m_pLine(NULL)
+    {
+    }
 };
 
 typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f0a9d7d..341e591 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -776,7 +776,6 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
     delete pOKBtn;
     delete pCancelBtn;
     delete pHelpBtn;
-    delete pImpl->m_pTabPage;
     delete pImpl->m_pSfxPage;
     delete pImpl->m_pLine;
     delete pImpl;
@@ -804,10 +803,7 @@ void SfxSingleTabDialog::SetTabPage( SfxTabPage* pTabPage,
     if ( !pHelpBtn )
         pHelpBtn = new HelpButton( this );
 
-    if ( pImpl->m_pTabPage )
-        delete pImpl->m_pTabPage;
-    if ( pImpl->m_pSfxPage )
-        delete pImpl->m_pSfxPage;
+    delete pImpl->m_pSfxPage;
     pImpl->m_pSfxPage = pTabPage;
     fnGetRanges = pRangesFunc;