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

7 files changed, 11 insertions, 11 deletions

diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 5335e700f3e0..1c0b6af7fb9b 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -46,7 +46,7 @@ protected:
 
 
     virtual vcl::Window* GetWindowImpl() = 0;
-    virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0;
+    virtual ::comphelper::OInterfaceContainerHelper2& GetTopWindowListenersImpl() = 0;
 
     VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer );
 
@@ -86,7 +86,7 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base,
 {
 protected:
     virtual vcl::Window* GetWindowImpl() override;
-    virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() override;
+    virtual ::comphelper::OInterfaceContainerHelper2& GetTopWindowListenersImpl() override;
 
 public:
     VCLXTopWindow(bool bWHWND = false);
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index a353c4a44b43..67d6f7ed39a9 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -102,8 +102,8 @@ protected:
                                         bool bWithDefaults = false );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds );
 
-    ::cppu::OInterfaceContainerHelper&  GetContainerListeners();
-    ::cppu::OInterfaceContainerHelper&  GetTopWindowListeners();
+    ::comphelper::OInterfaceContainerHelper2&  GetContainerListeners();
+    ::comphelper::OInterfaceContainerHelper2&  GetTopWindowListeners();
 
 public:
     typedef ::std::function<void ()>  Callback;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 87918266d03f..cf2e214721e0 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -79,7 +79,7 @@ public:
 
 protected:
     ContainerListenerMultiplexer        maContainerListeners;
-    ::cppu::OInterfaceContainerHelper   maChangeListeners;
+    ::comphelper::OInterfaceContainerHelper2   maChangeListeners;
     UnoControlModelHolderList           maModels;
 
     AllGroups                           maGroups;
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index d31f49bcddce..a410c722add8 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -92,7 +92,7 @@ protected:
     MouseListenerMultiplexer            maMouseListeners;
     MouseMotionListenerMultiplexer      maMouseMotionListeners;
     PaintListenerMultiplexer            maPaintListeners;
-    ::cppu::OInterfaceContainerHelper   maModeChangeListeners;
+    ::comphelper::OInterfaceContainerHelper2   maModeChangeListeners;
 
     css::uno::Reference< css::uno::XInterface >       mxContext;
     css::uno::Reference< css::awt::XControlModel >    mxModel;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 31b92959b7c5..220c32aa933d 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -877,7 +877,7 @@ private:
 
 protected:
     std::unique_ptr<UnoControlListBoxModel_Data>  m_xData;
-    ::cppu::OInterfaceContainerHelper             m_aItemListListeners;
+    ::comphelper::OInterfaceContainerHelper2             m_aItemListListeners;
 };
 
 
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( \