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

5 files changed, 7 insertions, 5 deletions

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index f00be260e861..ce2549eb7711 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -38,6 +38,7 @@
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index c37ae995b879..e43a4c50de4e 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
 
 #include "intercept.hxx"
 #include "docholder.hxx"
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index a2c6f4fcc7ac..7df7f686d741 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -22,7 +22,7 @@
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XInterceptorInfo.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -140,7 +140,7 @@ private:
 
     static css::uno::Sequence< OUString > m_aInterceptedURL;
 
-    cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;
+    comphelper::OInterfaceContainerHelper2*    m_pDisposeEventListeners;
     StatusChangeListenerContainer*    m_pStatCL;
 };
 
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 6a7b9e471131..91492197e3a7 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1437,7 +1437,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
 
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer =
+        ::comphelper::OInterfaceContainerHelper2* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
@@ -1729,7 +1729,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
 
     if ( bModified && m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer =
+        ::comphelper::OInterfaceContainerHelper2* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XModifyListener>::get());
         if ( pContainer != NULL )
         {
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 9fdeb18b80a6..1abc8f176067 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -190,7 +190,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
 {
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
+        ::comphelper::OInterfaceContainerHelper2* pContainer = m_pInterfaceContainer->getContainer(
                             cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pContainer != NULL )
         {