summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-05-29 16:50:50 +0200
committerLászló Németh <laszlo.nemeth@collabora.com>2015-05-29 17:01:10 +0200
commitbec67f339b9b000628e2b82e2b38cd1cae37f94a (patch)
tree86e586a315433facf6fce35e3d96da30600a77dc /sd
parente008e587ce556fa7567914c5953e4706089ca413 (diff)
dispose SfxControllerItem objects correctly
Change-Id: Id5f80e06e5609b4e85f3d6db7bc37aabe6ef0dac
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/view/sdruler.cxx2
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 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();