create comphelper::OMultiTypeInterfaceContainerHelper2 and use it

based on OInterfaceContainerHelper2 which is considerably
faster than the original OInterfaceContainerHelper

Change-Id: I9c8b6d0e5382018824bf7188a26343703abf2d51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120161
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 60 insertions, 62 deletions

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 5b4c1da23fd5..933ddb60a3db 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -37,7 +37,7 @@
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/multicontainer2.hxx>
 #include <comphelper/lok.hxx>
 #include <sal/log.hxx>
 
@@ -129,13 +129,13 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sa
     if ( !m_pInterfaceContainer )
         return;
 
-    ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
+    comphelper::OInterfaceContainerHelper2* pContainer = m_pInterfaceContainer->getContainer(
                         cppu::UnoType<embed::XStateChangeListener>::get());
     if ( pContainer == nullptr )
         return;
 
     lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+    comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
 
     // should be locked after the method is finished successfully
     rGuard.clear();
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index ab9f2b53c0ff..8d2cb7332a40 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/io/TempFile.hpp>
+#include <comphelper/multicontainer2.hxx>
 #include <comphelper/storagehelper.hxx>
 
 #include <cppuhelper/queryinterface.hxx>
@@ -355,7 +356,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     if ( !m_pInterfaceContainer )
         return;
 
-    ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer(
+    comphelper::OInterfaceContainerHelper2* pIC = m_pInterfaceContainer->getContainer(
                                         cppu::UnoType<document::XEventListener>::get());
     if( !pIC )
         return;
@@ -366,7 +367,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     // For now all the events are sent as object events
     // aEvent.Source = ( xSource.is() ? xSource
     //                       : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) );
-    ::cppu::OInterfaceIteratorHelper aIt( *pIC );
+    comphelper::OInterfaceIteratorHelper2 aIt( *pIC );
     while( aIt.hasMoreElements() )
     {
         try
@@ -486,7 +487,7 @@ void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Referenc
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
@@ -514,11 +515,11 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer =
+        comphelper::OInterfaceContainerHelper2* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
             while (pIterator.hasMoreElements())
             {
                 try
@@ -536,7 +537,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
                                     cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
             while (pCloseIterator.hasMoreElements())
             {
                 try
@@ -606,7 +607,7 @@ void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< uti
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper(m_aMutex));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2(m_aMutex));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
@@ -628,7 +629,7 @@ void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< doc
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper(m_aMutex));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2(m_aMutex));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index e37aca939b9b..8bd43fc488ae 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 
+#include <comphelper/multicontainer2.hxx>
 #include <dummyobject.hxx>
 
 
@@ -60,7 +61,7 @@ void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     if ( !m_pInterfaceContainer )
         return;
 
-    ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer(
+    comphelper::OInterfaceContainerHelper2* pIC = m_pInterfaceContainer->getContainer(
                                         cppu::UnoType<document::XEventListener>::get());
     if( !pIC )
         return;
@@ -71,7 +72,7 @@ void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     // For now all the events are sent as object events
     // aEvent.Source = ( xSource.is() ? xSource
     //                     : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) );
-    ::cppu::OInterfaceIteratorHelper aIt( *pIC );
+    comphelper::OInterfaceIteratorHelper2 aIt( *pIC );
     while( aIt.hasMoreElements() )
     {
         try
@@ -506,7 +507,7 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference
         return;
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
@@ -534,11 +535,11 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer =
+        comphelper::OInterfaceContainerHelper2* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
             while (pIterator.hasMoreElements())
             {
                 try
@@ -556,7 +557,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
                                     cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
             while (pCloseIterator.hasMoreElements())
             {
                 try
@@ -584,7 +585,7 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util
         return;
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
@@ -606,7 +607,7 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< docu
         return;
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index b055adc4a9f1..4b087ccc7601 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -54,8 +54,8 @@ namespace com::sun::star {
     }
 }
 
-namespace cppu {
-    class OMultiTypeInterfaceContainerHelper;
+namespace comphelper {
+    class OMultiTypeInterfaceContainerHelper2;
 }
 
 namespace comphelper {
@@ -86,7 +86,7 @@ protected:
 
     rtl::Reference<DocumentHolder> m_xDocHolder;
 
-    std::unique_ptr<::cppu::OMultiTypeInterfaceContainerHelper> m_pInterfaceContainer;
+    std::unique_ptr<::comphelper::OMultiTypeInterfaceContainerHelper2> m_pInterfaceContainer;
 
     bool m_bReadOnly;
 
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 17d113cb7153..cc7355668dd6 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/multicontainer2.hxx>
 
 namespace com::sun::star {
     namespace embed {
@@ -43,10 +43,6 @@ namespace com::sun::star {
     }
 }
 
-namespace cppu {
-    class OMultiTypeInterfaceContainerHelper;
-}
-
 /**
  * Represents an OLE object that has native data (next to the replacement
  * image), but we don't understand that data.
@@ -56,7 +52,7 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
                         , css::embed::XEmbedPersist >
 {
     ::osl::Mutex    m_aMutex;
-    std::unique_ptr<cppu::OMultiTypeInterfaceContainerHelper>
+    std::unique_ptr<comphelper::OMultiTypeInterfaceContainerHelper2>
         m_pInterfaceContainer;
     bool m_bDisposed;
 
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 7eea3d407e7d..d0884871deb4 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -39,8 +39,8 @@
 #include <osl/thread.h>
 #include <memory>
 
-namespace cppu {
-    class OMultiTypeInterfaceContainerHelper;
+namespace comphelper {
+    class OMultiTypeInterfaceContainerHelper2;
 }
 
 class VerbExecutionController
@@ -122,7 +122,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
 
     rtl::Reference<OleComponent> m_pOleComponent;
 
-    std::unique_ptr<::cppu::OMultiTypeInterfaceContainerHelper> m_pInterfaceContainer;
+    std::unique_ptr<::comphelper::OMultiTypeInterfaceContainerHelper2> m_pInterfaceContainer;
 
     bool m_bReadOnly;
 
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index b0c4fc62c1ac..3834d4098170 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/awt/XRequestCallback.hpp>
 
 #include "platform.h"
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/windowserrorstring.hxx>
@@ -1460,11 +1460,11 @@ 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 != nullptr)
             {
-                ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+                comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
                 while (pIterator.hasMoreElements())
                 {
                     try
@@ -1483,7 +1483,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
                 = m_pInterfaceContainer->getContainer(cppu::UnoType<util::XCloseListener>::get());
             if (pContainer != nullptr)
             {
-                ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+                comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
                 while (pCloseIterator.hasMoreElements())
                 {
                     try
@@ -1511,7 +1511,7 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
@@ -1682,7 +1682,7 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
@@ -1743,11 +1743,11 @@ 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 != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
+            comphelper::OInterfaceIteratorHelper2 pIterator( *pContainer );
             while ( pIterator.hasMoreElements() )
             {
                 try
@@ -1771,7 +1771,7 @@ void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
+        m_pInterfaceContainer = new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex );
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
 }
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 08f1cbed696f..5a96b64fcbfc 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ref.hxx>
 
-namespace cppu {
-    class OMultiTypeInterfaceContainerHelper;
+namespace comphelper {
+    class OMultiTypeInterfaceContainerHelper2;
 }
 
 class OleWrapperClientSite;
@@ -48,7 +48,7 @@ class OleComponent : public ::cppu::WeakImplHelper< css::util::XCloseable, css::
                                                     css::datatransfer::XTransferable >
 {
     ::osl::Mutex m_aMutex;
-    ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
+    comphelper::OMultiTypeInterfaceContainerHelper2* m_pInterfaceContainer;
 
     bool m_bDisposed;
     bool m_bModified;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 8c23a4429895..ba678d4dfb87 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
@@ -125,13 +125,13 @@ void OleEmbeddedObject::MoveListeners()
 
     // move state change listeners
     {
-        ::cppu::OInterfaceContainerHelper* pStateChangeContainer =
+        comphelper::OInterfaceContainerHelper2* pStateChangeContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pStateChangeContainer != nullptr )
         {
             if ( m_xWrappedObject.is() )
             {
-                ::cppu::OInterfaceIteratorHelper pIterator( *pStateChangeContainer );
+                comphelper::OInterfaceIteratorHelper2 pIterator( *pStateChangeContainer );
                 while ( pIterator.hasMoreElements() )
                 {
                     try
@@ -149,13 +149,13 @@ void OleEmbeddedObject::MoveListeners()
 
     // move event listeners
     {
-        ::cppu::OInterfaceContainerHelper* pEventContainer =
+        comphelper::OInterfaceContainerHelper2* pEventContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get());
         if ( pEventContainer != nullptr )
         {
             if ( m_xWrappedObject.is() )
             {
-                ::cppu::OInterfaceIteratorHelper pIterator( *pEventContainer );
+                comphelper::OInterfaceIteratorHelper2 pIterator( *pEventContainer );
                 while ( pIterator.hasMoreElements() )
                 {
                     try
@@ -173,13 +173,13 @@ void OleEmbeddedObject::MoveListeners()
 
     // move close listeners
     {
-        ::cppu::OInterfaceContainerHelper* pCloseContainer =
+        comphelper::OInterfaceContainerHelper2* pCloseContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pCloseContainer != nullptr )
         {
             if ( m_xWrappedObject.is() )
             {
-                ::cppu::OInterfaceIteratorHelper pIterator( *pCloseContainer );
+                comphelper::OInterfaceIteratorHelper2 pIterator( *pCloseContainer );
                 while ( pIterator.hasMoreElements() )
                 {
                     try
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index f85c845e31a8..a4045f34b4f2 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/multicontainer2.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
 #include <oleembobj.hxx>
@@ -156,14 +156,14 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
     if ( !m_pInterfaceContainer )
         return;
 
-    ::cppu::OInterfaceContainerHelper* pContainer =
-    m_pInterfaceContainer->getContainer(
+    comphelper::OInterfaceContainerHelper2* pContainer =
+        m_pInterfaceContainer->getContainer(
                                 cppu::UnoType<document::XEventListener>::get());
     if ( pContainer == nullptr )
         return;
 
     document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName );
-    ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+    comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
     while (pIterator.hasMoreElements())
     {
         try
@@ -181,12 +181,12 @@ void OleEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sal_In
 {
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
+        comphelper::OInterfaceContainerHelper2* pContainer = m_pInterfaceContainer->getContainer(
                             cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pContainer != nullptr )
         {
             lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
-            ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
 
             while (pIterator.hasMoreElements())
             {
@@ -399,7 +399,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
@@ -446,11 +446,11 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
     if ( m_pInterfaceContainer )
     {
-        ::cppu::OInterfaceContainerHelper* pContainer =
+        comphelper::OInterfaceContainerHelper2* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pIterator(*pContainer);
             while (pIterator.hasMoreElements())
             {
                 try
@@ -468,7 +468,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
                                     cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != nullptr )
         {
-            ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
+            comphelper::OInterfaceIteratorHelper2 pCloseIterator(*pContainer);
             while (pCloseIterator.hasMoreElements())
             {
                 try
@@ -504,7 +504,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
@@ -549,7 +549,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
         throw lang::DisposedException(); // TODO
 
     if ( !m_pInterfaceContainer )
-        m_pInterfaceContainer.reset(new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex ));
+        m_pInterfaceContainer.reset(new comphelper::OMultiTypeInterfaceContainerHelper2( m_aMutex ));
 
     m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }