[Libreoffice-commits] core.git: canvas/source

Takeshi Abe tabe at fixedpoint.jp
Fri Jul 10 00:39:55 PDT 2015 

 canvas/source/cairo/cairo_canvas.hxx             |    6 +++---
 canvas/source/cairo/cairo_canvasbitmap.hxx       |    4 ++--
 canvas/source/cairo/cairo_canvascustomsprite.hxx |    6 +++---
 canvas/source/cairo/cairo_canvasfont.hxx         |    4 ++--
 canvas/source/cairo/cairo_canvashelper.cxx       |    6 +++---
 canvas/source/cairo/cairo_devicehelper.cxx       |    2 --
 canvas/source/cairo/cairo_spritecanvas.hxx       |    6 +++---
 canvas/source/cairo/cairo_spritedevicehelper.cxx |    2 --
 canvas/source/cairo/cairo_textlayout.hxx         |    4 ++--
 canvas/source/directx/dx_canvas.hxx              |    7 +++----
 canvas/source/directx/dx_canvasbitmap.hxx        |    6 ++----
 canvas/source/directx/dx_canvascustomsprite.hxx  |    6 +++---
 canvas/source/directx/dx_canvasfont.hxx          |    4 ++--
 canvas/source/directx/dx_devicehelper.cxx        |    2 --
 canvas/source/directx/dx_spritecanvas.hxx        |    6 +++---
 canvas/source/directx/dx_spritedevicehelper.cxx  |    2 --
 canvas/source/directx/dx_textlayout.hxx          |    4 ++--
 canvas/source/factory/cf_service.cxx             |    4 ++--
 canvas/source/opengl/ogl_canvasbitmap.hxx        |    4 ++--
 canvas/source/opengl/ogl_canvascustomsprite.hxx  |    4 ++--
 canvas/source/opengl/ogl_canvasfont.hxx          |    4 ++--
 canvas/source/opengl/ogl_spritecanvas.hxx        |    4 ++--
 canvas/source/opengl/ogl_textlayout.hxx          |    4 ++--
 canvas/source/simplecanvas/simplecanvasimpl.cxx  |    4 ++--
 canvas/source/tools/canvastools.cxx              |    6 +++---
 canvas/source/vcl/canvas.hxx                     |    4 ++--
 canvas/source/vcl/canvasbitmap.hxx               |    4 ++--
 canvas/source/vcl/canvascustomsprite.hxx         |    6 +++---
 canvas/source/vcl/canvasfont.hxx                 |    4 ++--
 canvas/source/vcl/spritecanvas.hxx               |    6 +++---
 canvas/source/vcl/textlayout.hxx                 |    4 ++--
 31 files changed, 64 insertions(+), 75 deletions(-)

New commits:
commit b854086df80b2607a3506bc8d455c98ae58aa295
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Jul 6 23:17:44 2015 +0900

    tdf#88206 replace cppu::WeakImplHelper* etc.
    
    with the variadic variants, in canvas.
    
    Change-Id: I8604e6b6e0f45539e3411c98a166518b837b6758
    Reviewed-on: https://gerrit.libreoffice.org/16798
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index d3e342e..edaa7f8 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -53,7 +53,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                                 ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::rendering::XGraphicDevice,
                                                 ::com::sun::star::lang::XMultiServiceFactory,
@@ -72,7 +72,7 @@ namespace cairocanvas
         implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::CanvasBase directly from
         SurfaceProvider (because derivees of
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index bf1299f..3ad2547 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -44,7 +44,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                               ::com::sun::star::lang::XServiceInfo,
                                               ::com::sun::star::beans::XFastPropertySet >   CanvasBitmapBase_Base;
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index f4be338..defdfae 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -47,7 +47,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
@@ -58,7 +58,7 @@ namespace cairocanvas
         already implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::CanvasCustomSpriteBase directly from
         ::canvas::Sprite (because derivees of
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 677b6c4..4571c19 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,7 +41,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 64686fc..ae6c58c 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -45,7 +45,7 @@
 #include <basegfx/tools/lerp.hxx>
 
 #include <comphelper/sequence.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <canvas/canvastools.hxx>
 #include <canvas/parametricpolypolygon.hxx>
@@ -1580,7 +1580,7 @@ namespace cairocanvas
 
     namespace
     {
-        class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
+        class CairoColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace >
         {
         private:
             uno::Sequence< sal_Int8 >  maComponentTags;
@@ -1937,7 +1937,7 @@ namespace cairocanvas
             }
         };
 
-        class CairoNoAlphaColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
+        class CairoNoAlphaColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace >
         {
         private:
             uno::Sequence< sal_Int8 >  maComponentTags;
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 7fd8a46..b13124d 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -22,8 +22,6 @@
 #include <canvas/canvastools.hxx>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-
 #include <com/sun/star/lang/NoSupportException.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index ae419c7..a636442 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -51,7 +51,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::rendering::XSpriteCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XSpriteCanvas,
                                                 ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::rendering::XGraphicDevice,
                                                 ::com::sun::star::lang::XMultiServiceFactory,
@@ -71,7 +71,7 @@ namespace cairocanvas
         implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::SpriteCanvasBase directly from
         ::canvas::SpriteSurface (because derivees of
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 6f7730b..b043ca5 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -22,8 +22,6 @@
 #include <canvas/canvastools.hxx>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-
 #include <com/sun/star/lang/NoSupportException.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 80bfe85..88af49c 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -40,7 +40,7 @@
 
 namespace cairocanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
     class TextLayout : public ::comphelper::OBaseMutex,
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index 9ee0195..b054236 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -31,8 +31,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase7.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/integerbitmapbase.hxx>
@@ -48,7 +47,7 @@
 
 namespace dxcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::rendering::XCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvas,
                                                ::com::sun::star::rendering::XGraphicDevice,
                                               ::com::sun::star::lang::XMultiServiceFactory,
                                               ::com::sun::star::util::XUpdatable,
@@ -104,7 +103,7 @@ namespace dxcanvas
 
 
 
-    typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                                ::com::sun::star::rendering::XIntegerBitmap,
                                                ::com::sun::star::rendering::XGraphicDevice,
                                               ::com::sun::star::lang::XMultiServiceFactory,
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 680848d..bf8f9d9 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
-#include <cppuhelper/compbase4.hxx>
-
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -31,7 +29,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>
@@ -47,7 +45,7 @@
 
 namespace dxcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                ::com::sun::star::lang::XServiceInfo,
                                                ::com::sun::star::beans::XFastPropertySet >      CanvasBitmapBase_Base;
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 1f96957..3966ea5 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -45,7 +45,7 @@
 
 namespace dxcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
@@ -56,7 +56,7 @@ namespace dxcanvas
         already implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::CanvasCustomSpriteBase directly from
         ::canvas::Sprite (because derivees of
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index ebb3d55..8181f39 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,7 +43,7 @@ namespace dxcanvas
     typedef ::boost::shared_ptr< Gdiplus::Font >        FontSharedPtr;
     typedef ::boost::shared_ptr< Gdiplus::FontFamily >  FontFamilySharedPtr;
 
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index 76e891a..6f7d36e 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -27,8 +27,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <basegfx/tools/canvastools.hxx>
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index 8a2f4fd..80013d4 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -48,7 +48,7 @@
 
 namespace dxcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::rendering::XSpriteCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XSpriteCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                               ::com::sun::star::rendering::XGraphicDevice,
                                               ::com::sun::star::lang::XMultiServiceFactory,
@@ -68,7 +68,7 @@ namespace dxcanvas
         implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::SpriteCanvasBase directly from
         ::canvas::SpriteSurface (because derivees of
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 5b24ff2f..fc8662c 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -25,8 +25,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <basegfx/tools/canvastools.hxx>
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index 7b3d56d7..ef238d5 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -40,7 +40,7 @@
 /* Definition of TextLayout class */
 namespace dxcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
     class TextLayout : public ::comphelper::OBaseMutex,
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index bbe17fb..a375bea 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -22,7 +22,7 @@
 #include <osl/process.h>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -50,7 +50,7 @@ namespace
 {
 
 class CanvasFactory
-    : public ::cppu::WeakImplHelper3< lang::XServiceInfo,
+    : public ::cppu::WeakImplHelper< lang::XServiceInfo,
                                       lang::XMultiComponentFactory,
                                       lang::XMultiServiceFactory >
 {
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx
index 534837a..675a860 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -29,7 +29,7 @@
 
 namespace oglcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap > CanvasBitmapBase_Base;
     typedef ::canvas::IntegerBitmapBase<
         canvas::BitmapCanvasBase2<
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx
index 7708e95..19fe3a1 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -29,7 +29,7 @@
 
 namespace oglcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCustomSprite,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCustomSprite,
                                               ::com::sun::star::rendering::XCanvas > CanvasCustomSpriteBase_Base;
     typedef ::canvas::CanvasBase<
          ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >,
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 8946413..0ab99d7 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -28,7 +28,7 @@ namespace oglcanvas
 {
     class SpriteCanvas;
 
-    typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::rendering::XCanvasFont > CanvasFontBaseT;
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvasFont > CanvasFontBaseT;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
                        public CanvasFontBaseT,
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 6d4995b..5db00f3 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -36,7 +36,7 @@ namespace oglcanvas
 {
     class CanvasCustomSprite;
 
-    typedef ::cppu::WeakComponentImplHelper8< ::com::sun::star::rendering::XSpriteCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XSpriteCanvas,
                                                 ::com::sun::star::rendering::XGraphicDevice,
                                                 ::com::sun::star::lang::XMultiServiceFactory,
                                                 ::com::sun::star::rendering::XBufferController,
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 1bb7749..6541369 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/rendering/XTextLayout.hpp>
@@ -26,7 +26,7 @@
 
 namespace oglcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::rendering::XTextLayout > TextLayoutBaseT;
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XTextLayout > TextLayoutBaseT;
 
     class TextLayout : public ::comphelper::OBaseMutex,
                        public TextLayoutBaseT,
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index a503a2f..2bb88c4 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -27,7 +27,7 @@
 #include <o3tl/lazy_update.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <comphelper/servicedecl.hxx>
@@ -106,7 +106,7 @@ namespace
     };
 
 
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XSimpleCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XSimpleCanvas,
                                               ::com::sun::star::lang::XServiceName >    SimpleCanvasBase;
 
     class SimpleCanvasImpl : private cppu::BaseMutex,
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 7db3572..d7886fd 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -52,7 +52,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/instance.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
@@ -220,7 +220,7 @@ namespace canvas
 
         namespace
         {
-            class StandardColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
+            class StandardColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace >
             {
             private:
                 uno::Sequence< sal_Int8 >  maComponentTags;
@@ -558,7 +558,7 @@ namespace canvas
                 }
             };
 
-            class StandardNoAlphaColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
+            class StandardNoAlphaColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerBitmapColorSpace >
             {
             private:
                 uno::Sequence< sal_Int8 >  maComponentTags;
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 18fc745..6a805e8 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
@@ -48,7 +48,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                ::com::sun::star::rendering::XGraphicDevice,
                                               ::com::sun::star::lang::XMultiServiceFactory,
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index 52cd32f..c522a41 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -45,7 +45,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XBitmapCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XBitmapCanvas,
                                                ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::lang::XServiceInfo,
                                              ::com::sun::star::beans::XFastPropertySet >    CanvasBitmapBase_Base;
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 0b5fb50..69dba98 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -47,7 +47,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCustomSprite,
                                                ::com::sun::star::rendering::XBitmapCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                                 ::com::sun::star::lang::XServiceInfo >  CanvasCustomSpriteBase_Base;
@@ -58,7 +58,7 @@ namespace vclcanvas
         already implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::CanvasCustomSpriteBase directly from
         ::canvas::Sprite (because derivees of
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 30cc464..01a3096 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,7 +43,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCanvasFont,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XCanvasFont,
                                                ::com::sun::star::lang::XServiceInfo > CanvasFont_Base;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 19bced3..cb5d106 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
@@ -50,7 +50,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::rendering::XSpriteCanvas,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XSpriteCanvas,
                                               ::com::sun::star::rendering::XIntegerBitmap,
                                               ::com::sun::star::rendering::XGraphicDevice,
                                               ::com::sun::star::lang::XMultiServiceFactory,
@@ -71,7 +71,7 @@ namespace vclcanvas
         implement some of those interface methods.
 
         The reason why this appears kinda convoluted is the fact that
-        we cannot specify non-IDL types as WeakComponentImplHelperN
+        we cannot specify non-IDL types as WeakComponentImplHelper
         template args, and furthermore, don't want to derive
         ::canvas::SpriteCanvasBase directly from
         ::canvas::SpriteSurface (because derivees of
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 8dc7f89..eed0d1e 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -39,7 +39,7 @@
 
 namespace vclcanvas
 {
-    typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XTextLayout,
+    typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::rendering::XTextLayout,
                                                ::com::sun::star::lang::XServiceInfo > TextLayout_Base;
 
     class TextLayout : public ::comphelper::OBaseMutex,

More information about the Libreoffice-commits mailing list