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 | |
parent | 47a72493a9106a4783bfcb7c34a8cde579a2cba0 (diff) |
std::list<sal_uInt16> -> vector
Change-Id: Ic08ac3fcb750ceff1f5b3201d4a3151ad567aa1f
-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 | ||||
-rw-r--r-- | svtools/source/inc/unoiface.hxx | 32 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 17 | ||||
-rw-r--r-- | toolkit/inc/helper/unopropertyarrayhelper.hxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 10 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 48 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/helper/unopropertyarrayhelper.cxx | 4 |
17 files changed, 125 insertions, 125 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) diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 7b9bc25f96b8..ec04cd216fd0 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -105,8 +105,8 @@ public: // css::awt::XWindow void SAL_CALL setFocus( ) 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 ); } }; @@ -159,8 +159,8 @@ public: 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 ); } }; @@ -209,8 +209,8 @@ protected: virtual void SetWindow( const VclPtr< vcl::Window > &_pWindow) 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 ); } }; @@ -275,8 +275,8 @@ protected: // VCLXGraphicControl overridables virtual void ImplSetNewImage() 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 ); } }; @@ -315,8 +315,8 @@ public: void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL isStrictFormat( ) 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 ); } }; @@ -359,8 +359,8 @@ public: void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL isStrictFormat( ) 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 ); } }; @@ -401,8 +401,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 ); } }; @@ -417,8 +417,8 @@ public: // css::awt::VclWindowPeer 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 ); } }; #endif // INCLUDED_SVTOOLS_SOURCE_INC_UNOIFACE_HXX diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 0e14c9a78375..f76fab042dee 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -522,7 +522,7 @@ void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(css::uno::RuntimeException, GetWindow()->GrabFocus(); } -void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMultiLineEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, // FIXME: elide duplication ? @@ -532,7 +532,6 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_HIDEINACTIVESELECTION, 0); VCLXWindow::ImplGetPropertyIds( rIds, true ); - } // class VCLXFileControl @@ -796,7 +795,7 @@ void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) nCols = pControl->GetEdit().GetMaxVisChars(); } -void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFileControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, // FIXME: elide duplication ? @@ -1364,7 +1363,7 @@ void SVTXFormattedField::NotifyTextListeners() } } -void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void SVTXFormattedField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, // FIXME: elide duplication ? @@ -1630,7 +1629,7 @@ void SVTXRoadmap::ImplSetNewImage() pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() ); } -void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void SVTXRoadmap::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_COMPLETE, @@ -1804,7 +1803,7 @@ sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, st return pField && pField->IsStrictFormat(); } -void SVTXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void SVTXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { SVTXFormattedField::ImplGetPropertyIds( rIds ); } @@ -2032,7 +2031,7 @@ css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) thr return SVTXFormattedField::getProperty(PropertyName); } -void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void SVTXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_CURRENCYSYMBOL, @@ -2277,7 +2276,7 @@ css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw return aProp; } -void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXProgressBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_PROGRESSVALUE, @@ -2325,7 +2324,7 @@ void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const cs } } -void SVTXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void SVTXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_TEXTLINECOLOR, diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 3b5ae6a1c171..4d29030fc847 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -23,7 +23,7 @@ #include <toolkit/dllapi.h> #include <cppuhelper/propshlp.hxx> -#include <list> +#include <vector> #include <set> @@ -39,7 +39,7 @@ protected: public: UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int32>& rIDs ); - UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); + UnoPropertyArrayHelper( const std::vector< sal_uInt16 > &rIDs ); // ::cppu::IPropertyArrayHelper sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) override; diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index c9d230e5555a..a0c7d305f156 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -34,7 +34,7 @@ // class VCLXContainer -void VCLXContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 8af76d12b98a..c053aaead062 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::view; // class VCLXTabPageContainer -void VCLXTabPageContainer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTabPageContainer::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a04f968ff219..e21d7bb2e416 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -241,7 +241,7 @@ void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (Runt // class VCLXTopWindow -void VCLXTopWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTopWindow::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXContainer::ImplGetPropertyIds( rIds ); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index ee51e0ce3e05..3e825b5b9e20 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1279,7 +1279,7 @@ namespace toolkit } // Terminated by BASEPROPERTY_NOTFOUND (or 0) -void VCLXWindow::PushPropertyIds( std::list< sal_uInt16 > &rIds, +void VCLXWindow::PushPropertyIds( std::vector< sal_uInt16 > &rIds, int nFirstId, ...) { va_list pVarArgs; @@ -1292,7 +1292,7 @@ void VCLXWindow::PushPropertyIds( std::list< sal_uInt16 > &rIds, va_end( pVarArgs ); } -void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDefaults ) +void VCLXWindow::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds, bool bWithDefaults ) { // These are common across ~all VCLXWindow derived classes if( bWithDefaults ) @@ -1314,7 +1314,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe // lovely hack from: // void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId ) - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIds.begin(); iter != rIds.end(); ++iter) { if( *iter == BASEPROPERTY_FONTDESCRIPTOR ) { @@ -1331,7 +1331,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe } } -void VCLXWindow::GetPropertyIds( std::list< sal_uInt16 >& _out_rIds ) +void VCLXWindow::GetPropertyIds( std::vector< sal_uInt16 >& _out_rIds ) { return ImplGetPropertyIds( _out_rIds, mpImpl->mbWithDefaultProps ); } @@ -2551,7 +2551,7 @@ VCLXWindow::GetPropHelper() SolarMutexGuard aGuard; if ( mpImpl->mpPropHelper == nullptr ) { - std::list< sal_uInt16 > aIDs; + std::vector< sal_uInt16 > aIDs; GetPropertyIds( aIDs ); mpImpl->mpPropHelper = new UnoPropertyArrayHelper( aIDs ); } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index b246d20c9723..83c2c562225b 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -204,7 +204,7 @@ namespace toolkit // class VCLXGraphicControl -void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXGraphicControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } @@ -335,7 +335,7 @@ css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) th // class VCLXButton -void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -618,7 +618,7 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXImageControl -void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXImageControl::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -749,7 +749,7 @@ css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) thro // class VCLXCheckBox -void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXCheckBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_DEFAULTCONTROL, @@ -1049,7 +1049,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXRadioButton -void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXRadioButton::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_DEFAULTCONTROL, @@ -1332,7 +1332,7 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled ) // class VCLXSpinField -void VCLXSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR, @@ -1465,7 +1465,7 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXListBox -void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXListBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -2154,7 +2154,7 @@ void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (Runti // class VCLXMessageBox -void VCLXMessageBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMessageBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); } @@ -2235,7 +2235,7 @@ css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(css::uno::Runtime // class VCLXDialog -void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXDialog::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { VCLXTopWindow::ImplGetPropertyIds( rIds ); } @@ -2420,7 +2420,7 @@ VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 ) OSL_TRACE("VCLXMultiPage::VCLXMultiPage()" ); } -void VCLXMultiPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMultiPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -2702,7 +2702,7 @@ VCLXTabPage::VCLXTabPage() { } -void VCLXTabPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTabPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -3091,7 +3091,7 @@ css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) th return aProp; } -void VCLXFixedHyperlink::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFixedHyperlink::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -3120,7 +3120,7 @@ void VCLXFixedHyperlink::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) // class VCLXFixedText -void VCLXFixedText::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFixedText::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -3263,7 +3263,7 @@ css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize ) // class VCLXScrollBar -void VCLXScrollBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXScrollBar::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, @@ -3740,7 +3740,7 @@ css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(css::uno::RuntimeE // class VCLXEdit -void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXEdit::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -4117,7 +4117,7 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // class VCLXComboBox -void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXComboBox::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_AUTOCOMPLETE, @@ -4612,7 +4612,7 @@ void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (Runt // class VCLXFormattedSpinField -void VCLXFormattedSpinField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFormattedSpinField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { // Interestingly in the UnoControl API this is // - not derived from XEdit ultimately, (correct ?) - so cut this here ... @@ -4718,7 +4718,7 @@ css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName // class VCLXDateField -void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXDateField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5067,7 +5067,7 @@ sal_Bool VCLXDateField::isStrictFormat() throw(css::uno::RuntimeException, std:: // class VCLXTimeField -void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXTimeField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5376,7 +5376,7 @@ css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(c // class VCLXNumericField -void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXNumericField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5720,7 +5720,7 @@ css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) thro // class VCLXMetricField // ---------------------------------------------------- -void VCLXMetricField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXMetricField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -5969,7 +5969,7 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw // class VCLXCurrencyField -void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -6326,7 +6326,7 @@ css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) thr // class VCLXPatternField -void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXPatternField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_ALIGN, @@ -6516,7 +6516,7 @@ VCLXFrame::VCLXFrame() { } -void VCLXFrame::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXFrame::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, BASEPROPERTY_BACKGROUNDCOLOR, diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 546b651fd3b3..31dca8b755da 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -400,9 +400,9 @@ void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId ) } } -void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rIds ) +void UnoControlModel::ImplRegisterProperties( const std::vector< sal_uInt16 > &rIds ) { - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIds.begin(); iter != rIds.end(); ++iter) { if( !ImplHasProperty( *iter ) ) diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index c67673d38347..3d0c184578f7 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -34,9 +34,9 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const css::uno::Sequence<sal_Int maIDs.insert( pIDs[n] ); } -UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ) +UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::vector< sal_uInt16 > &rIDs ) { - std::list< sal_uInt16 >::const_iterator iter; + std::vector< sal_uInt16 >::const_iterator iter; for( iter = rIDs.begin(); iter != rIDs.end(); ++iter) maIDs.insert( *iter ); } |