diff options
| author | Noel Grandin <noel@peralex.com> | 2012-02-29 11:07:02 +0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-03-05 16:51:51 +0400 |
| commit | d578654354cc15b4d491b441412c1eb41a878b10 (patch) | |
| tree | 89a29f2d0df22909d89824543727f792a123faaf /toolkit/inc | |
| parent | 9db31fc5669abd1e1f8db5e9267c91423b36f223 (diff) | |
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.
Diffstat (limited to 'toolkit/inc')
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; |