From d966837ff30cf629cbb343f2f6dc507853a73270 Mon Sep 17 00:00:00 2001
From: Joseph Powers <jpowers27@cox.net>
Date: Fri, 10 Dec 2010 07:02:29 -0800
Subject: Removed DECLARE_LIST( IMPL_ControlInfoList, IMPL_ControlInfo* )

Also fixed a memory leak...
	BaseContainerControl::impl_cleanMemory
	The old code would delete object[0] size() times :(
---
 UnoControls/inc/basecontainercontrol.hxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'UnoControls/inc')

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index cc052ca67f5f..72f0e2fd751e 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <tools/list.hxx>
+#include <vector>
 
 //____________________________________________________________________________________________________________
 //  includes of my own project
@@ -71,10 +72,6 @@ struct IMPL_ControlInfo
     ::rtl::OUString                         sName    ;
 };
 
-// makro define a list-class for struct IMPL_ControlInfo!
-class IMPL_ControlInfoList ;
-DECLARE_LIST( IMPL_ControlInfoList, IMPL_ControlInfo* )
-
 //____________________________________________________________________________________________________________
 //  classes
 //____________________________________________________________________________________________________________
@@ -576,7 +573,7 @@ private:
 
 private:
     // list of pointer of "struct IMPL_ControlInfo" to hold child-controls
-    IMPL_ControlInfoList*                                               m_pControlInfoList      ;
+    ::std::vector< IMPL_ControlInfo* > maControlInfoList;
 
     // list of references of XTabController to hold tab-order in this container
     CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >  m_xTabControllerList    ;
-- 
cgit