2 files changed, 3 insertions, 6 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index f07ff4d64251..6c8435791883 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -150,7 +150,6 @@ UnoControl::UnoControl() :
 
 UnoControl::~UnoControl()
 {
-    DELETEZ( mpData );
 }
 
 OUString UnoControl::GetComponentServiceName()
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 0a992812f7d8..5b533dddb22a 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -381,7 +381,7 @@ UnoControlContainer::UnoControlContainer()
     :UnoControlContainer_Base()
     ,maCListeners( *this )
 {
-    mpControls = new UnoControlHolderList;
+    mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::UnoControlContainer(const uno::Reference< awt::XWindowPeer >& xP )
@@ -390,12 +390,11 @@ UnoControlContainer::UnoControlContainer(const uno::Reference< awt::XWindowPeer
 {
     setPeer( xP );
     mbDisposePeer = false;
-    mpControls = new UnoControlHolderList;
+    mpControls.reset(new UnoControlHolderList);
 }
 
 UnoControlContainer::~UnoControlContainer()
 {
-    DELETEZ( mpControls );
 }
 
 void UnoControlContainer::ImplActivateTabControllers()
@@ -433,8 +432,7 @@ void UnoControlContainer::dispose(  )
 
 
     // Delete all structures
-    DELETEZ( mpControls );
-    mpControls = new UnoControlHolderList;
+    mpControls.reset(new UnoControlHolderList);
 
     UnoControlBase::dispose();
 }