5 files changed, 18 insertions, 13 deletions
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 5d2b824df208..db87ee74faa0 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -101,10 +101,6 @@ OCopyTable::OCopyTable(vcl::Window * pParent)
     SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY));
 }
 
-OCopyTable::~OCopyTable()
-{
-}
-
 IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
 {
 
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 0df651f41212..dbb53a8313d6 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -81,6 +81,11 @@ OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent)
 
 OWizColumnSelect::~OWizColumnSelect()
 {
+    dispose();
+}
+
+void OWizColumnSelect::dispose()
+{
     while ( m_pNewColumnNames->GetEntryCount() )
     {
         void* pData = m_pNewColumnNames->GetEntryData(0);
@@ -90,6 +95,7 @@ OWizColumnSelect::~OWizColumnSelect()
         m_pNewColumnNames->RemoveEntry(0);
     }
     m_pNewColumnNames->Clear();
+    OWizardPage::dispose();
 }
 
 void OWizColumnSelect::Reset()
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d5e57ffe34e9..f4394921c68a 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -686,6 +686,11 @@ void OCopyTableWizard::construct()
 
 OCopyTableWizard::~OCopyTableWizard()
 {
+    dispose();
+}
+
+void OCopyTableWizard::dispose()
+{
     for ( ;; )
     {
         TabPage *pPage = GetPage(0);
@@ -710,6 +715,7 @@ OCopyTableWizard::~OCopyTableWizard()
     delete m_pbPrev;
     delete m_pbNext;
     delete m_pbFinish;
+    WizardDialog::dispose();
 }
 
 IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl)
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 52af008b4979..a837ff2670de 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -72,10 +72,6 @@ OWizNameMatching::OWizNameMatching( vcl::Window* pParent)
     m_sDestText   += "\n";
 }
 
-OWizNameMatching::~OWizNameMatching()
-{
-}
-
 void OWizNameMatching::Reset()
 {
     // urspr"unglichen zustand wiederherstellen
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 40e2227fd3ea..44c2b6b2eafd 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -49,11 +49,6 @@ OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window*
     m_pParentTabPage = pParentTabPage;
 }
 
-OWizTypeSelectControl::~OWizTypeSelectControl()
-{
-
-}
-
 void OWizTypeSelectControl::ActivateAggregate( EControlType eType )
 {
     switch(eType )
@@ -255,7 +250,13 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
 
 OWizTypeSelect::~OWizTypeSelect()
 {
+    dispose();
+}
+
+void OWizTypeSelect::dispose()
+{
     delete m_pTypeControl;
+    OWizardPage::dispose();
 }
 
 OUString OWizTypeSelect::GetTitle() const