1 files changed, 10 insertions, 3 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e624ad6d8b13..3e2f0b0f2e44 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -45,6 +45,12 @@ using namespace ::com::sun::star::uno;
 
 #define USERITEM_NAME OUString("UserItem")
 
+SingleTabDlgImpl::SingleTabDlgImpl()
+        : m_pSfxPage(NULL)
+        , m_pLine(NULL)
+    {
+    }
+
 class SfxModelessDialog_Impl : public SfxListener
 {
 public:
@@ -706,9 +712,10 @@ SfxSingleTabDialog::~SfxSingleTabDialog()
 
 void SfxSingleTabDialog::dispose()
 {
-    delete pImpl->m_pSfxPage;
-    delete pImpl->m_pLine;
     delete pImpl;
+    pOKBtn.clear();
+    pCancelBtn.clear();
+    pHelpBtn.clear();
     SfxModalDialog::dispose();
 }
 
@@ -723,7 +730,7 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
 
 {
     SetUniqId(nSettingsId);
-    delete pImpl->m_pSfxPage;
+    pImpl->m_pSfxPage.clear();
     pImpl->m_pSfxPage = pTabPage;
     fnGetRanges = pRangesFunc;