1 files changed, 27 insertions, 6 deletions
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 1bc7861c0905..a57f3e0dca35 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -199,17 +199,38 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
 
 SfxSaveTabPage::~SfxSaveTabPage()
 {
-    delete pImpl;
+    disposeOnce();
 }
 
-
-
-SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent,
-                                    const SfxItemSet* rAttrSet )
+void SvxSaveTabPage::dispose()
 {
-    return ( new SfxSaveTabPage( pParent, *rAttrSet ) );
+    delete pImpl;
+    pImpl = NULL;
+    aLoadUserSettingsCB.clear();
+    aLoadDocPrinterCB.clear();
+    aDocInfoCB.clear();
+    aBackupCB.clear();
+    aAutoSaveCB.clear();
+    aAutoSaveEdit.clear();
+    aMinuteFT.clear();
+    aUserAutoSaveCB.clear();
+    aRelativeFsysCB.clear();
+    aRelativeInetCB.clear();
+    aODFVersionLB.clear();
+    aWarnAlienFormatCB.clear();
+    aDocTypeLB.clear();
+    aSaveAsFT.clear();
+    aSaveAsLB.clear();
+    aODFWarningFI.clear();
+    aODFWarningFT.clear();
+    SfxTabPage::dispose();
 }
 
+VclPtr<SfxTabPage> SfxSaveTabPage::Create( vcl::Window* pParent,
+                                           const SfxItemSet* rAttrSet )
+{
+    return VclPtr<SfxSaveTabPage>::Create( pParent, *rAttrSet );
+}
 
 void SfxSaveTabPage::DetectHiddenControls()
 {