1 files changed, 13 insertions, 2 deletions
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 19a306d8e43c..942f95a46f15 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -113,6 +113,17 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
     SetHighlightRange( );
 }
 
+FmFieldWinListBox::~FmFieldWinListBox()
+{
+    dispose();
+}
+
+void FmFieldWinListBox::dispose()
+{
+    pTabWin.clear();
+    SvTreeListBox::dispose();
+}
+
 
 sal_Int8 FmFieldWinListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
@@ -198,7 +209,7 @@ void FmFieldWin::dispose()
         m_pChangeListener->release();
         //  delete m_pChangeListener;
     }
-    delete pListBox;
+    pListBox.clear();
     delete pData;
     SfxFloatingWindow::dispose();
 }
@@ -416,7 +427,7 @@ FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId,
     pWindow = new FmFieldWin(_pBindings, this, _pParent);
     SetHideNotDelete(true);
     eChildAlignment = SfxChildAlignment::NOALIGNMENT;
-    static_cast<SfxFloatingWindow*>(pWindow)->Initialize( _pInfo );
+    static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( _pInfo );
 }