dispose SfxControllerItem objects correctly

Change-Id: Id5f80e06e5609b4e85f3d6db7bc37aabe6ef0dac

16 files changed, 30 insertions, 14 deletions

diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 0587f879f711..1fbe4cd9dbee 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -42,6 +42,12 @@ SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings & rBindings, SvxHpLinkD
     pParent = pDlg;
 }
 
+void SvxHlinkCtrl::dispose()
+{
+    aRdOnlyForwarder.dispose();
+    ::SfxControllerItem::dispose();
+}
+
 void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                  const SfxPoolItem* pState )
 {
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index b85633738ddf..08541f81e2e1 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -44,6 +44,7 @@ private :
 
 public :
     SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                 const SfxPoolItem* pState ) SAL_OVERRIDE;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 46b9e5122555..0b033f9c2cc3 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -211,7 +211,7 @@ AnimationWindow::~AnimationWindow()
 
 void AnimationWindow::dispose()
 {
-    delete pControllerItem;
+    DELETEZ( pControllerItem );
 
     for (size_t i = 0; i < m_FrameList.size(); ++i)
     {
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index ae1f66e41731..388f54f13424 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -161,8 +161,8 @@ SdNavigatorWin::~SdNavigatorWin()
 
 void SdNavigatorWin::dispose()
 {
-    delete mpNavigatorCtrlItem;
-    delete mpPageNameCtrlItem;
+    DELETEZ( mpNavigatorCtrlItem );
+    DELETEZ( mpPageNameCtrlItem );
     maToolbox.disposeAndClear();
     maTlbObjects.disposeAndClear();
     maLbDocs.disposeAndClear();
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 8c3c9b78fba7..3c2b12a4ecff 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -99,7 +99,7 @@ void Ruler::dispose()
 {
     SfxBindings& rBindings = pCtrlItem->GetBindings();
     rBindings.EnterRegistrations();
-    delete pCtrlItem;
+    DELETEZ( pCtrlItem );
     rBindings.LeaveRegistrations();
     pSdWin.clear();
     SvxRuler::dispose();
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 7b2b7e6343c8..009622d10c31 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 0e539ac85a3a..455ef5e612ef 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -333,9 +333,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 6ec506815821..9762b5820ac1 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 792efa855ef0..3800cb69e620 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();
 }
 
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index c3abce92e64b..5c68de1433c5 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -877,6 +877,8 @@ void SwNavigationPI::dispose()
 
     aPageChgIdle.Stop();
 
+    ::SfxControllerItem::dispose();
+
     vcl::Window::dispose();
 }