From d578654354cc15b4d491b441412c1eb41a878b10 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 29 Feb 2012 11:07:02 +0200
Subject: Convert ImplPropertyTable from tools/table.hxx to std::map

 In the process, remove the ImplControlProperty struct,
 since it was duplicating information already stored in the
 key of the map.
---
 toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolkit/inc')

diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 7aba0ec710ee..13c3b38e9cc3 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -50,8 +50,9 @@
 #include <comphelper/uno3.hxx>
 
 #include <list>
+#include <map>
 
-class ImplPropertyTable;
+typedef std::map<sal_uInt16, ::com::sun::star::uno::Any> ImplPropertyTable;
 
 //  ----------------------------------------------------
 //  class UnoControlModel
@@ -71,7 +72,7 @@ class TOOLKIT_DLLPUBLIC UnoControlModel :public UnoControlModel_Base
                                         ,public ::cppu::OPropertySetHelper
 {
 private:
-    ImplPropertyTable*                      mpData;
+    ImplPropertyTable                       maData;
     EventListenerMultiplexer                maDisposeListeners;
 
 protected:
@@ -112,7 +113,6 @@ protected:
 public:
                 UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                 UnoControlModel( const UnoControlModel& rModel );
-                ~UnoControlModel();
 
     virtual UnoControlModel*    Clone() const = 0;
 
-- 
cgit