diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-05-29 16:50:50 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-01 12:04:36 +0000 |
| commit | 241083066c1e7c94d9e7a4240751e775eb023829 (patch) | |
| tree | 1048532ec213ddfd113f06809cd086c33c731d07 /sd | |
| parent | 13da15429b670d78174d7da605058a2e4636f297 (diff) | |
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>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/sdruler.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
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 52e1833422c5..4ad74fcacbc7 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -162,8 +162,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(); |