tdf#88206 replace cppu::WeakImplHelper* misc

also edited two examples in canvas comments

Change-Id: Iac82b462168f869f995c33bb2c639f3dbe09cbd5
Reviewed-on: https://gerrit.libreoffice.org/31715
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

9 files changed, 24 insertions, 24 deletions

diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index e4a2206dada8..0d5b8b3b2d87 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/FillRule.hpp>
 #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
@@ -33,7 +33,7 @@ namespace basegfx
 {
 namespace unotools
 {
-    typedef ::cppu::WeakComponentImplHelper3<
+    typedef cppu::WeakComponentImplHelper<
             css::rendering::XLinePolyPolygon2D,
             css::rendering::XBezierPolyPolygon2D,
             css::lang::XServiceInfo > UnoPolyPolygonBase;
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 5f9cc18cda49..2a6a304e0169 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <basic/basicdllapi.h>
 #include <vector>
 
-class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< css::task::XInteractionRequest >
+class BASIC_DLLPUBLIC ModuleSizeExceeded : public cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
 // C++ interface
 public:
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 6b25a1564c2d..8fb1ac04639c 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCachedPrimitive.hpp>
 #include <com/sun/star/rendering/ViewState.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <canvas/canvastoolsdllapi.h>
@@ -34,8 +34,8 @@
 
 namespace canvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< css::rendering::XCachedPrimitive,
-                                              css::lang::XServiceInfo > CachedPrimitiveBase_Base;
+    typedef cppu::WeakComponentImplHelper< css::rendering::XCachedPrimitive,
+                                           css::lang::XServiceInfo > CachedPrimitiveBase_Base;
 
     /** Base class, providing common functionality for implementers of
         the XCachedPrimitive interface.
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 5713831c3fea..cf30aabc8c6a 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -47,7 +47,7 @@ namespace canvas
 
         <pre>
         Example:
-        typedef ::cppu::WeakComponentImplHelper4< css::rendering::XSpriteCanvas,
+        typedef ::cppu::WeakComponentImplHelper < css::rendering::XSpriteCanvas,
                                                   css::lang::XInitialization,
                                                   css::lang::XServiceInfo,
                                                   css::lang::XServiceName > CanvasBase_Base;
@@ -61,12 +61,12 @@ namespace canvas
         </pre>
 
         @tpl Base
-        Base class to use, most probably one of the
-        WeakComponentImplHelperN templates with the appropriate
+        Base class to use, most probably the
+        WeakComponentImplHelper template with the appropriate
         interfaces. At least XCanvas should be among them (why else
         would you use this template, then?). Base class must have an
         Base( const Mutex& ) constructor (like the
-        WeakComponentImplHelperN templates have). As the very least,
+        WeakComponentImplHelper template has). As the very least,
         the base class must be derived from uno::XInterface, as some
         error reporting mechanisms rely on that.
 
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index df291175746a..28c208a1d296 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -57,7 +57,7 @@ namespace canvas
 
         <pre>
         Example:
-        typedef ::cppu::WeakComponentImplHelper5< css::rendering::XGraphicDevice,
+        typedef ::cppu::WeakComponentImplHelper < css::rendering::XGraphicDevice,
                                                   css::rendering::XColorSpace,
                                                   css::rendering::XPropertySet,
                                                   css::lang::XServiceInfo,
@@ -70,12 +70,12 @@ namespace canvas
         </pre>
 
         @tpl Base
-        Base class to use, most probably one of the
-        WeakComponentImplHelperN templates with the appropriate
+        Base class to use, most probably the
+        WeakComponentImplHelper template with the appropriate
         interfaces. At least XGraphicDevice should be among them (why else
         would you use this template, then?). Base class must have an
         Base( const Mutex& ) constructor (like the
-        WeakComponentImplHelperN templates have). As the very least,
+        WeakComponentImplHelper template has). As the very least,
         the base class must be derived from uno::XInterface, as some
         error reporting mechanisms rely on that.
 
diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index 598a010e9c90..10b563eb62fd 100644
--- a/include/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
@@ -40,8 +40,8 @@ namespace basegfx
 
 namespace canvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D,
-                                                   css::lang::XServiceInfo > ParametricPolyPolygon_Base;
+    typedef cppu::WeakComponentImplHelper< css::rendering::XParametricPolyPolygon2D,
+                                           css::lang::XServiceInfo > ParametricPolyPolygon_Base;
 
     class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex,
                                   public ParametricPolyPolygon_Base
diff --git a/include/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx
index 65afc14fbcc5..8328c3573195 100644
--- a/include/connectivity/sdbcx/VTypeDef.hxx
+++ b/include/connectivity/sdbcx/VTypeDef.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
@@ -29,7 +29,7 @@ namespace connectivity
 {
     namespace sdbcx
     {
-        typedef ::cppu::WeakComponentImplHelper3< css::sdbcx::XColumnsSupplier,
+        typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier,
                                                   css::container::XNamed,
                                                   css::lang::XServiceInfo> ODescriptor_BASE;
     }
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 61a563485e75..f9ba1b82f80a 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -22,7 +22,7 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/graphic/XPrimitive3D.hpp>
 #include <basegfx/range/b3drange.hxx>
@@ -50,7 +50,7 @@ namespace drawinglayer { namespace geometry {
 
 namespace drawinglayer { namespace primitive3d {
     /// typedefs for basePrimitive3DImplBase, Primitive3DContainer and Primitive3DReference
-    typedef cppu::WeakComponentImplHelper1< css::graphic::XPrimitive3D > BasePrimitive3DImplBase;
+    typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitive3D > BasePrimitive3DImplBase;
     typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference;
     typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence;
 
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index f3c19a2c6ca1..0bf31b4b0ba0 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <formula/formuladllapi.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -46,7 +46,7 @@ namespace formula
 
 class FormulaCompiler;
 
-class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
+class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public cppu::WeakImplHelper<
                             css::sheet::XFormulaOpCodeMapper,
                             css::lang::XServiceInfo >
 {