diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-06 23:17:44 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-10 07:39:31 +0000 |
| commit | b854086df80b2607a3506bc8d455c98ae58aa295 (patch) | |
| tree | 6a2a79e91c1b2008f5d4c4d1f5744981ab58e4db /canvas/source/cairo/cairo_canvas.hxx | |
| parent | 37a367a3589302893c237237e4eb98f1e4195f6d (diff) | |
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@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas/source/cairo/cairo_canvas.hxx')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index d3e342ea7747..edaa7f8708e2 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 |