1 files changed, 40 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 6349c0796c58..0173584e3455 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -88,23 +88,23 @@ namespace dbp
     }
 
 
-    OWizardPage* OListComboWizard::createPage(WizardState _nState)
+    VclPtr<TabPage> OListComboWizard::createPage(WizardState _nState)
     {
         switch (_nState)
         {
             case LCW_STATE_DATASOURCE_SELECTION:
-                return new OTableSelectionPage(this);
+                return VclPtr<OTableSelectionPage>::Create(this);
             case LCW_STATE_TABLESELECTION:
-                return new OContentTableSelection(this);
+                return VclPtr<OContentTableSelection>::Create(this);
             case LCW_STATE_FIELDSELECTION:
-                return new OContentFieldSelection(this);
+                return VclPtr<OContentFieldSelection>::Create(this);
             case LCW_STATE_FIELDLINK:
-                return new OLinkFieldsPage(this);
+                return VclPtr<OLinkFieldsPage>::Create(this);
             case LCW_STATE_COMBODBFIELD:
-                return new OComboDBFieldPage(this);
+                return VclPtr<OComboDBFieldPage>::Create(this);
         }
 
-        return NULL;
+        return VclPtr<TabPage>();
     }
 
 
@@ -285,6 +285,16 @@ namespace dbp
         m_pSelectTable->SetSelectHdl(LINK(this, OContentTableSelection, OnTableSelected));
     }
 
+    OContentTableSelection::~OContentTableSelection()
+    {
+        disposeOnce();
+    }
+
+    void OContentTableSelection::dispose()
+    {
+        m_pSelectTable.clear();
+        OLCPage::dispose();
+    }
 
     void OContentTableSelection::ActivatePage()
     {
@@ -369,6 +379,18 @@ namespace dbp
         m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
     }
 
+    OContentFieldSelection::~OContentFieldSelection()
+    {
+        disposeOnce();
+    }
+
+    void OContentFieldSelection::dispose()
+    {
+        m_pSelectTableField.clear();
+        m_pDisplayedField.clear();
+        m_pInfo.clear();
+        OLCPage::dispose();
+    }
 
     void OContentFieldSelection::ActivatePage()
     {
@@ -439,6 +461,17 @@ namespace dbp
         m_pTableField->SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified));
     }
 
+    OLinkFieldsPage::~OLinkFieldsPage()
+    {
+        disposeOnce();
+    }
+
+    void OLinkFieldsPage::dispose()
+    {
+        m_pValueListField.clear();
+        m_pTableField.clear();
+        OLCPage::dispose();
+    }
 
     void OLinkFieldsPage::ActivatePage()
     {