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( \