From b854086df80b2607a3506bc8d455c98ae58aa295 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Mon, 6 Jul 2015 23:17:44 +0900 Subject: 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 Reviewed-by: Noel Grandin --- canvas/source/cairo/cairo_canvas.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'canvas/source/cairo/cairo_canvas.hxx') 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 #include -#include +#include #include #include @@ -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 -- cgit