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/controls | |
parent | 47a72493a9106a4783bfcb7c34a8cde579a2cba0 (diff) |
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
Diffstat (limited to 'include/toolkit/controls')
-rw-r--r-- | include/toolkit/controls/controlmodelcontainerbase.hxx | 1 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 6 |
2 files changed, 4 insertions, 3 deletions
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) |