diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-01 08:40:17 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-09-01 11:05:21 +0200 |
commit | 3069878c60da990a603754ced4a64be4e7855538 (patch) | |
tree | fb63de0a75ee2216b97625bd658747b5d13ab6d0 /include/toolkit | |
parent | 47a72493a9106a4783bfcb7c34a8cde579a2cba0 (diff) |
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
Diffstat (limited to 'include/toolkit')
-rw-r--r-- | include/toolkit/awt/vclxcontainer.hxx | 6 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtabpagecontainer.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtopwindow.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindow.hxx | 8 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 96 | ||||
-rw-r--r-- | include/toolkit/controls/controlmodelcontainerbase.hxx | 1 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 6 |
7 files changed, 63 insertions, 62 deletions
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index 2ba61b179674..732d7d200f05 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -48,7 +48,7 @@ public: // css::lang::XTypeProvider css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // css::awt::XVclContainer void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override; @@ -63,8 +63,8 @@ public: // css::awt::XVclWindowPeer void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index 92d10d1a176d..d8e90ab8e9af 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -60,8 +60,8 @@ public: virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 5a65a949b11a..f80734e626d3 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -101,8 +101,8 @@ public: css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 67d6f7ed39a9..775d38e84d06 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -44,7 +44,7 @@ #include <tools/link.hxx> #include <stdarg.h> -#include <list> +#include <vector> #include <functional> @@ -96,11 +96,11 @@ protected: ::toolkit::IAccessibleFactory& getAccessibleFactory(); // helper ... - static void PushPropertyIds( std::list< sal_uInt16 > &aIds, int nFirstId, ...); + static void PushPropertyIds( std::vector< sal_uInt16 > &aIds, int nFirstId, ...); // for use in controls/ - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds, + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds, bool bWithDefaults = false ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ); ::comphelper::OInterfaceContainerHelper2& GetContainerListeners(); ::comphelper::OInterfaceContainerHelper2& GetTopWindowListeners(); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index f065f4788070..84830085c813 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -136,8 +136,8 @@ protected: virtual void ImplSetNewImage(); public: - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -186,8 +186,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -208,8 +208,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } protected: virtual void ImplSetNewImage() override; @@ -269,8 +269,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -326,8 +326,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -361,8 +361,8 @@ public: // css::awt::XLayoutConstrains css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -395,8 +395,8 @@ public: // css::awt::XVclWindowPeer void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -434,8 +434,8 @@ public: // css::awt::XDevice, css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } // css::awt::XVclWindowPeer void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; @@ -470,8 +470,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; TabPage* getTabPage() const throw ( css::uno::RuntimeException); - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; class VCLXMultiPage : public css::awt::XSimpleTabController, public VCLXContainer @@ -520,8 +520,8 @@ public: // C++ TabControl* getTabControl() const throw ( css::uno::RuntimeException); sal_uInt16 insertTab( TabPage*, OUString& sTitle ); - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -575,8 +575,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -612,8 +612,8 @@ public: css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -673,8 +673,8 @@ public: css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override; static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException); - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -741,8 +741,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -818,8 +818,8 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -882,8 +882,8 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -920,8 +920,8 @@ public: void SAL_CALL last( ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -948,8 +948,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -996,8 +996,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -1041,8 +1041,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -1086,8 +1086,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -1138,8 +1138,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -1184,8 +1184,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -1220,8 +1220,8 @@ public: void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; - static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); - virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index cf2e214721e0..17e524c9d5b6 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -41,6 +41,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <tools/gen.hxx> +#include <list> // class ControlModelContainerBase diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index ec3286a1764c..e83c9492ed08 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -40,7 +40,7 @@ #include <cppuhelper/implbase7.hxx> #include <comphelper/uno3.hxx> -#include <list> +#include <vector> #include <map> typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable; @@ -71,7 +71,7 @@ protected: protected: void ImplRegisterProperty( sal_uInt16 nPropType ); - void ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ); + void ImplRegisterProperties( const std::vector< sal_uInt16 > &rIds ); void ImplRegisterProperty( sal_uInt16 nPropId, const css::uno::Any& rDefault ); css::uno::Sequence<sal_Int32> ImplGetPropertyIds() const; virtual css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; @@ -176,7 +176,7 @@ public: #define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \ do { \ - std::list< sal_uInt16 > aIds; \ + std::vector< sal_uInt16 > aIds; \ a::ImplGetPropertyIds( aIds ); \ ImplRegisterProperties( aIds ); \ } while (false) |