From 1075c5e96fdc8916c9eb2a25ee67aac4daf03383 Mon Sep 17 00:00:00 2001
From: László Németh <laszlo.nemeth@collabora.com>
Date: Fri, 29 May 2015 16:50:50 +0200
Subject: dispose SfxControllerItem objects correctly

Change-Id: Id5f80e06e5609b4e85f3d6db7bc37aabe6ef0dac
Reviewed-on: https://gerrit.libreoffice.org/15976
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
---
 svx/source/dialog/_contdlg.cxx  |  1 +
 svx/source/dialog/fontwork.cxx  |  2 +-
 svx/source/dialog/imapdlg.cxx   |  3 ++-
 svx/source/dialog/srchdlg.cxx   | 10 +++++-----
 svx/source/engine3d/float3d.cxx |  6 +++---
 svx/source/form/datanavi.cxx    |  1 +
 svx/source/form/filtnav.cxx     |  1 +
 svx/source/form/fmPropBrw.cxx   |  1 +
 svx/source/form/fmexpl.cxx      |  1 +
 svx/source/form/tabwin.cxx      |  1 +
 10 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'svx')

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index e7c1d3e22baa..3426ea395879 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -305,6 +305,7 @@ void SvxSuperContourDlg::dispose()
     m_pTbx1.clear();
     m_pMtfTolerance.clear();
     m_pStbStatus.clear();
+    aContourItem.dispose();
     SvxContourDlg::dispose();
 }
 
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 1b6e0bf27329..8c64e41078dc 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -294,7 +294,7 @@ SvxFontWorkDialog::~SvxFontWorkDialog()
 void SvxFontWorkDialog::dispose()
 {
     for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++)
-        DELETEZ(pCtrlItems[i]);
+        pCtrlItems[i]->dispose();
     m_pTbxStyle.clear();
     m_pTbxAdjust.clear();
     m_pFbDistance.clear();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a98f1a60f827..772f9708fc44 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -222,7 +222,7 @@ void SvxIMapDlg::dispose()
 {
     // Delete URL-List
     pIMapWnd.disposeAndClear();
-    delete pOwnData;
+    DELETEZ( pOwnData );
     m_pTbxIMapDlg1.clear();
     m_pFtURL.clear();
     m_pURLBox.clear();
@@ -232,6 +232,7 @@ void SvxIMapDlg::dispose()
     m_pCbbTarget.clear();
     m_pStbStatus.clear();
     SfxModelessDialog::dispose();
+    aIMapItem.dispose();
 }
 
 bool SvxIMapDlg::Close()
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 33dbbb806797..efe7b6b873c1 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -353,11 +353,11 @@ void SvxSearchDialog::dispose()
     Hide();
 
     rBindings.EnterRegistrations();
-    delete pSearchController;
-    delete pOptionsController;
-    delete pFamilyController;
-    delete pSearchSetController;
-    delete pReplaceSetController;
+    DELETEZ( pSearchController );
+    DELETEZ( pOptionsController );
+    DELETEZ( pFamilyController );
+    DELETEZ( pSearchSetController );
+    DELETEZ( pReplaceSetController );
     rBindings.LeaveRegistrations();
 
     delete pSearchItem;
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 356bf4c39381..4289d7d84af1 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -335,9 +335,9 @@ void Svx3DWin::dispose()
     pVDev.disposeAndClear();
     delete pModel;
 
-    delete pControllerItem;
-    delete pConvertTo3DItem;
-    delete pConvertTo3DLatheItem;
+    DELETEZ( pControllerItem );
+    DELETEZ( pConvertTo3DItem );
+    DELETEZ( pConvertTo3DLatheItem );
 
     delete mpRemember2DAttributes;
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ca3acd9f2a9e..a37439eda1ca 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2177,6 +2177,7 @@ namespace svxform
     void DataNavigator::dispose()
     {
         m_aDataWin.disposeAndClear();
+        ::SfxControllerItem::dispose();
         SfxDockingWindow::dispose();
     }
 
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 0ac78dfb6d07..c258692dbf7d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1873,6 +1873,7 @@ FmFilterNavigatorWin::~FmFilterNavigatorWin()
 void FmFilterNavigatorWin::dispose()
 {
     m_pNavigator.disposeAndClear();
+    ::SfxControllerItem::dispose();
     SfxDockingWindow::dispose();
 }
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 427a16a9c6aa..b7256df132aa 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -279,6 +279,7 @@ void FmPropBrw::dispose()
     {
         DBG_UNHANDLED_EXCEPTION();
     }
+    ::SfxControllerItem::dispose();
     SfxFloatingWindow::dispose();
 }
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 11ee1c18c162..354887120517 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -520,6 +520,7 @@ namespace svxform
     void NavigatorFrame::dispose()
     {
         m_pNavigatorTree.disposeAndClear();
+        ::SfxControllerItem::dispose();
         SfxDockingWindow::dispose();
     }
 
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 2055f438a3ff..2a2187411681 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -211,6 +211,7 @@ void FmFieldWin::dispose()
     }
     pListBox.disposeAndClear();
     delete pData;
+    ::SfxControllerItem::dispose();
     SfxFloatingWindow::dispose();
 }
 
-- 
cgit