diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-01-19 19:45:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-01-25 08:52:03 +0200 |
| commit | 752cd07d085ac0aadc99bd512d49072843139032 (patch) | |
| tree | 21ff2f55761b34bfdd721b5e1ed43333e8874e46 /include/toolkit/helper | |
| parent | 0e7cd653ea90da388820220bf6a3eb140b57bbd6 (diff) | |
InterfaceContainer2 with vector instead of Sequence
create an InterfaceContainer2 class to replace InterfaceContainer.
It uses a std::vector instead of a Sequence for the mutable listener
list, which provides far better performance.
Switch all our internal use-sites to the new class.
Change-Id: I6b56cfa511ded2395faa22e68fab3b2f16c3cb88
Diffstat (limited to 'include/toolkit/helper')
| -rw-r--r-- | include/toolkit/helper/listenermultiplexer.hxx | 4 | ||||
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 49dab94db067..d1a1e6a11e07 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -43,7 +43,7 @@ #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/util/VetoException.hpp> #include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/mutexhelper.hxx> #include <toolkit/helper/macros.hxx> @@ -54,7 +54,7 @@ class TOOLKIT_DLLPUBLIC ListenerMultiplexerBase : public MutexHelper, - public ::cppu::OInterfaceContainerHelper, + public ::comphelper::OInterfaceContainerHelper2, public css::uno::XInterface { private: diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index e844bd350677..20e7c7cbf30a 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -142,7 +142,7 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti #define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( ClassName, InterfaceName, MethodName, ParamType1 ) \ { \ ParamType1 aMulti( evt ); \ - ::cppu::OInterfaceIteratorHelper aIt( *this ); \ + ::comphelper::OInterfaceIteratorHelper2 aIt( *this ); \ while( aIt.hasMoreElements() ) \ { \ css::uno::Reference< InterfaceName > xListener( \ @@ -168,7 +168,7 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti { \ EventType aMulti( evt ); \ aMulti.Source = &GetContext(); \ - ::cppu::OInterfaceIteratorHelper aIt( *this ); \ + ::comphelper::OInterfaceIteratorHelper2 aIt( *this ); \ while( aIt.hasMoreElements() ) \ { \ css::uno::Reference< InterfaceName > xListener( \ |