1 files changed, 33 insertions, 9 deletions
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index f76265dbf9b0..c41bbc1a07ca 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -67,6 +67,11 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent,
 
 ScTpSubTotalGroup::~ScTpSubTotalGroup()
 {
+    disposeOnce();
+}
+
+void ScTpSubTotalGroup::dispose()
+{
     sal_uLong  nCount = mpLbColumns->GetEntryCount();
 
     if ( nCount > 0 )
@@ -79,6 +84,10 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup()
             delete pData;
         }
     }
+    mpLbGroup.clear();
+    mpLbColumns.clear();
+    mpLbFunctions.clear();
+    SfxTabPage::dispose();
 }
 
 void ScTpSubTotalGroup::Init()
@@ -376,17 +385,17 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, void *, pLb )
 
 // Derived Group TabPages:
 
-SfxTabPage* ScTpSubTotalGroup1::Create( vcl::Window*         pParent,
+VclPtr<SfxTabPage> ScTpSubTotalGroup1::Create( vcl::Window*         pParent,
                                                  const SfxItemSet*  rArgSet )
-    { return ( new ScTpSubTotalGroup1( pParent, *rArgSet ) ); }
+    { return VclPtr<SfxTabPage>( new ScTpSubTotalGroup1( pParent, *rArgSet ), SAL_NO_ACQUIRE ); }
 
-SfxTabPage* ScTpSubTotalGroup2::Create( vcl::Window*          pParent,
+VclPtr<SfxTabPage> ScTpSubTotalGroup2::Create( vcl::Window*          pParent,
                                        const SfxItemSet*    rArgSet )
-    { return ( new ScTpSubTotalGroup2( pParent, *rArgSet ) ); }
+    { return VclPtr<SfxTabPage>( new ScTpSubTotalGroup2( pParent, *rArgSet ), SAL_NO_ACQUIRE ); }
 
-SfxTabPage* ScTpSubTotalGroup3::Create( vcl::Window*          pParent,
+VclPtr<SfxTabPage> ScTpSubTotalGroup3::Create( vcl::Window*          pParent,
                                        const SfxItemSet*    rArgSet )
-    { return ( new ScTpSubTotalGroup3( pParent, *rArgSet ) ); }
+    { return VclPtr<SfxTabPage>( new ScTpSubTotalGroup3( pParent, *rArgSet ), SAL_NO_ACQUIRE ); }
 
 ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) :
     ScTpSubTotalGroup( pParent, rArgSet )
@@ -442,6 +451,21 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( vcl::Window*               pParent,
 
 ScTpSubTotalOptions::~ScTpSubTotalOptions()
 {
+    disposeOnce();
+}
+
+void ScTpSubTotalOptions::dispose()
+{
+    pBtnPagebreak.clear();
+    pBtnCase.clear();
+    pBtnSort.clear();
+    pFlSort.clear();
+    pBtnAscending.clear();
+    pBtnDescending.clear();
+    pBtnFormats.clear();
+    pBtnUserDef.clear();
+    pLbUserDef.clear();
+    SfxTabPage::dispose();
 }
 
 void ScTpSubTotalOptions::Init()
@@ -460,10 +484,10 @@ void ScTpSubTotalOptions::Init()
     FillUserSortListBox();
 }
 
-SfxTabPage* ScTpSubTotalOptions::Create( vcl::Window*                 pParent,
-                                          const SfxItemSet*     rArgSet )
+VclPtr<SfxTabPage> ScTpSubTotalOptions::Create( vcl::Window* pParent,
+                                                const SfxItemSet* rArgSet )
 {
-    return ( new ScTpSubTotalOptions( pParent, *rArgSet ) );
+    return VclPtr<SfxTabPage>( new ScTpSubTotalOptions( pParent, *rArgSet ), SAL_NO_ACQUIRE );
 }
 
 void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )