From ca7bab0561aa6afa399f1d2f449402545768859e Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Fri, 4 Sep 2015 18:25:57 +0900
Subject: slideshow: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: I3160235d0e6253626a8facbfed33e3c252505cbf
Reviewed-on: https://gerrit.libreoffice.org/18336
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 slideshow/inc/pch/precompiled_slideshow.hxx                       | 5 ++---
 .../source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx  | 8 ++++----
 slideshow/source/engine/eventmultiplexer.cxx                      | 4 ++--
 slideshow/source/engine/shapes/gdimtftools.cxx                    | 5 ++---
 slideshow/source/engine/slideshowimpl.cxx                         | 5 ++---
 slideshow/source/engine/slideview.cxx                             | 4 ++--
 slideshow/test/demoshow.cxx                                       | 7 +++----
 slideshow/test/slidetest.cxx                                      | 1 -
 slideshow/test/testshape.cxx                                      | 4 ++--
 slideshow/test/testview.cxx                                       | 4 ++--
 slideshow/test/views.cxx                                          | 1 -
 11 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index a5ce13dc86ea..e007ffbe001d 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -174,11 +174,10 @@
 #include <cppcanvas/spritecanvas.hxx>
 #include <cppcanvas/vclfactory.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <functional>
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index b9816193611a..78f897519c4f 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/geometry/IntegerSize2D.hpp>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/factory.hxx>
 #include <rtl/ref.hxx>
@@ -92,7 +92,7 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
 namespace
 {
 
-typedef cppu::WeakComponentImplHelper1<presentation::XTransition> OGLTransitionerImplBase;
+typedef cppu::WeakComponentImplHelper<presentation::XTransition> OGLTransitionerImplBase;
 
 #if OSL_DEBUG_LEVEL > 1
 class TimerContext
@@ -605,7 +605,7 @@ void OGLTransitionerImpl::createTexture( GLuint* texID,
 
 namespace
 {
-    class OGLColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
+    class OGLColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace >
     {
     private:
         uno::Sequence< sal_Int8 >  maComponentTags;
@@ -1401,7 +1401,7 @@ OGLTransitionerImpl::OGLTransitionerImpl()
 {
 }
 
-typedef cppu::WeakComponentImplHelper1<presentation::XTransitionFactory> OGLTransitionFactoryImplBase;
+typedef cppu::WeakComponentImplHelper<presentation::XTransitionFactory> OGLTransitionFactoryImplBase;
 
 class OGLTransitionFactoryImpl : private cppu::BaseMutex, public OGLTransitionFactoryImplBase
 {
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 80702bf92ad2..9d295498f93c 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -21,7 +21,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <rtl/ref.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <com/sun/star/awt/XMouseListener.hpp>
@@ -107,7 +107,7 @@ template<typename T> inline T* get_pointer(PrioritizedHandlerEntry<T> const& han
 
 
 
-typedef cppu::WeakComponentImplHelper2<
+typedef cppu::WeakComponentImplHelper<
     awt::XMouseListener,
     awt::XMouseMotionListener > Listener_UnoBase;
 
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 83fce3d442eb..727e962f52d8 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -29,10 +29,9 @@
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
 
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
@@ -104,7 +103,7 @@ bool hasUnsupportedActions( const GDIMetaFile& rMtf )
 
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper1< graphic::XGraphicRenderer > DummyRenderer_Base;
+typedef ::cppu::WeakComponentImplHelper< graphic::XGraphicRenderer > DummyRenderer_Base;
 
 class DummyRenderer: public cppu::BaseMutex, public DummyRenderer_Base
 {
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 2633d11eb17b..99e34530dd31 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -21,10 +21,9 @@
 #include <tools/diagnose_ex.h>
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/exc_hlp.hxx>
 
@@ -203,7 +202,7 @@ private:
 
  ******************************************************************************/
 
-typedef cppu::WeakComponentImplHelper1<presentation::XSlideShow> SlideShowImplBase;
+typedef cppu::WeakComponentImplHelper<presentation::XSlideShow> SlideShowImplBase;
 
 typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector;
 
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 55c810d3841d..e3c00ea6d9c1 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -27,7 +27,7 @@
 #include "unoview.hxx"
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/make_shared_from_uno.hxx>
@@ -664,7 +664,7 @@ private:
 
 
 
-typedef cppu::WeakComponentImplHelper2<
+typedef cppu::WeakComponentImplHelper<
     ::com::sun::star::util::XModifyListener,
       ::com::sun::star::awt::XPaintListener> SlideViewBase;
 
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 70ad12250132..507ecc6ccb26 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -23,8 +23,7 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -66,7 +65,7 @@ using namespace ::com::sun::star;
 
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper1< presentation::XSlideShowView > ViewBase;
+typedef ::cppu::WeakComponentImplHelper< presentation::XSlideShowView > ViewBase;
 class View : public ::comphelper::OBaseMutex,
              public ViewBase
 {
@@ -201,7 +200,7 @@ private:
     Size                                       maSize;
 };
 
-typedef ::cppu::WeakComponentImplHelper2< drawing::XDrawPage,
+typedef ::cppu::WeakComponentImplHelper< drawing::XDrawPage,
                                           beans::XPropertySet > SlideBase;
 class DummySlide : public ::comphelper::OBaseMutex,
                    public SlideBase
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 5a72b6bbc469..dcd88856e381 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -23,7 +23,6 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 
-#include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index fbd1d2a27e5b..1aa53348f54f 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -22,7 +22,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
 
@@ -39,7 +39,7 @@ namespace target = slideshow::internal;
 using namespace ::com::sun::star;
 
 // our test shape subject
-typedef ::cppu::WeakComponentImplHelper1< drawing::XShape > ShapeBase;
+typedef ::cppu::WeakComponentImplHelper< drawing::XShape > ShapeBase;
 class ImplTestShape : public TestShape,
                       private cppu::BaseMutex,
                       public ShapeBase
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 0901f1c866b9..9538e928872c 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -22,7 +22,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
 
@@ -45,7 +45,7 @@ namespace target = slideshow::internal;
 using namespace ::com::sun::star;
 
 // our test view subject
-typedef ::cppu::WeakComponentImplHelper1< presentation::XSlideShowView > ViewBase;
+typedef ::cppu::WeakComponentImplHelper< presentation::XSlideShowView > ViewBase;
 class ImplTestView : public TestView,
                      private cppu::BaseMutex,
                      public ViewBase
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 4b751b237d2e..41e614310a80 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -22,7 +22,6 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
-- 
cgit