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, 11 insertions, 11 deletions

diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index de546680a4c4..e74b1ffa2f6d 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -144,7 +144,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e )
             // shape hit, and shape is visible. Raise
             // event.
 
-            boost::shared_ptr<cppu::OInterfaceContainerHelper> const pCont(
+            boost::shared_ptr<comphelper::OInterfaceContainerHelper2> const pCont(
                 aCurrBroadcaster->second );
             uno::Reference<drawing::XShape> const xShape(
                 aCurrBroadcaster->first->getXShape() );
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 1e0fd8912312..3fd8fb7035c1 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -157,7 +157,7 @@ private:
 
 
     typedef std::map<ShapeSharedPtr,
-                     boost::shared_ptr< ::cppu::OInterfaceContainerHelper >,
+                     boost::shared_ptr< ::comphelper::OInterfaceContainerHelper2 >,
                      Shape::lessThanShape>        ShapeToListenersMap;
     typedef std::map<ShapeSharedPtr, sal_Int16,
                        Shape::lessThanShape>      ShapeToCursorMap;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 008f5faacbd6..bdf15c87f31c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -422,7 +422,7 @@ private:
     UnoViewContainer                        maViewContainer;
 
     /// all registered slide show listeners
-    cppu::OInterfaceContainerHelper         maListenerContainer;
+    comphelper::OInterfaceContainerHelper2         maListenerContainer;
 
     /// map of vectors, containing all registered listeners for a shape
     ShapeEventListenerMap                   maShapeEventListeners;
@@ -1855,8 +1855,8 @@ void SlideShowImpl::addShapeEventListener(
         aIter = maShapeEventListeners.insert(
             ShapeEventListenerMap::value_type(
                 xShape,
-                boost::shared_ptr<cppu::OInterfaceContainerHelper>(
-                    new cppu::OInterfaceContainerHelper(m_aMutex)))).first;
+                boost::shared_ptr<comphelper::OInterfaceContainerHelper2>(
+                    new comphelper::OInterfaceContainerHelper2(m_aMutex)))).first;
     }
 
     // add new listener to broadcaster
diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx
index 82607d5df675..87fce1eefd2d 100644
--- a/slideshow/source/inc/shapemaps.hxx
+++ b/slideshow/source/inc/shapemaps.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEMAPS_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEMAPS_HXX
 
-#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <boost/shared_ptr.hpp>
@@ -39,7 +39,7 @@ namespace slideshow
     {
         /// Maps XShape to shape listener
         typedef ::std::map< css::uno::Reference< css::drawing::XShape>,
-                            boost::shared_ptr< ::cppu::OInterfaceContainerHelper >
+                            boost::shared_ptr< ::comphelper::OInterfaceContainerHelper2 >
                             >                  ShapeEventListenerMap;
 
         /// Maps XShape to mouse cursor
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 9ca1a87d4c11..9b4dc810beb7 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -192,10 +192,10 @@ private:
     }
 
     uno::Reference< rendering::XSpriteCanvas > mxCanvas;
-    ::cppu::OInterfaceContainerHelper          maPaintListeners;
-    ::cppu::OInterfaceContainerHelper          maTransformationListeners;
-    ::cppu::OInterfaceContainerHelper          maMouseListeners;
-    ::cppu::OInterfaceContainerHelper          maMouseMotionListeners;
+    ::comphelper::OInterfaceContainerHelper2          maPaintListeners;
+    ::comphelper::OInterfaceContainerHelper2          maTransformationListeners;
+    ::comphelper::OInterfaceContainerHelper2          maMouseListeners;
+    ::comphelper::OInterfaceContainerHelper2          maMouseMotionListeners;
     basegfx::B2DHomMatrix                      maTransform;
     Size                                       maSize;
 };