From 19edde184077eca38ce369304980a8a42fb3ab52 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 12 Mar 2014 10:06:42 +0100 Subject: Mark overriding BitmapCanvasBase class template member funs as SAL_OVERRIDE ...which reveals that SpriteCanvasBase is not derived from XBitmapCanvas, so split up BitmapCanvasBase (just XBitmap) and BitmapCanvasBase2 (plus XBitmapCanvas) and make IntegerBitmapBase directly abstract over those two as arguments. Change-Id: Ieae87fe466bb9f1a861c8a95162ef25235ae5799 --- canvas/source/cairo/cairo_canvas.hxx | 10 ++++++---- canvas/source/cairo/cairo_canvasbitmap.hxx | 9 +++++---- canvas/source/directx/dx_canvas.hxx | 10 ++++++---- canvas/source/directx/dx_canvasbitmap.hxx | 10 ++++++---- canvas/source/opengl/ogl_canvasbitmap.hxx | 9 +++++---- canvas/source/vcl/canvas.hxx | 10 ++++++---- canvas/source/vcl/canvasbitmap.hxx | 10 ++++++---- 7 files changed, 40 insertions(+), 28 deletions(-) (limited to 'canvas') diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 0aa07f383618..945bf5f2b568 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -85,10 +85,12 @@ namespace cairocanvas { }; - typedef ::canvas::IntegerBitmapBase< CanvasBaseSurfaceProvider_Base, - CanvasHelper, - ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBaseT; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + CanvasBaseSurfaceProvider_Base, + CanvasHelper, + ::osl::MutexGuard, + ::cppu::OWeakObject> > CanvasBaseT; /** Product of this component's factory. diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index fa33e20cc801..f67a955daded 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -55,10 +55,11 @@ namespace cairocanvas }; typedef ::canvas::IntegerBitmapBase< - CanvasBitmapSpriteSurface_Base, - CanvasHelper, - ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + canvas::BitmapCanvasBase2< + CanvasBitmapSpriteSurface_Base, + CanvasHelper, + ::osl::MutexGuard, + ::cppu::OWeakObject> > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public RepaintTarget diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 78e63ffef1d6..cf4e7ad64377 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -115,10 +115,12 @@ namespace dxcanvas DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase2_Base; - typedef ::canvas::IntegerBitmapBase< CanvasBase2_Base, - BitmapCanvasHelper, - ::osl::MutexGuard, - ::cppu::OWeakObject > BitmapCanvasBaseT; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + CanvasBase2_Base, + BitmapCanvasHelper, + ::osl::MutexGuard, + ::cppu::OWeakObject> > BitmapCanvasBaseT; /** Product of this component's factory. diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index a59228e35a29..bffcf1f433ca 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -51,10 +51,12 @@ namespace dxcanvas ::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; - typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, - BitmapCanvasHelper, - ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + BitmapCanvasHelper, + ::osl::MutexGuard, + ::cppu::OWeakObject> > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public BitmapProvider { diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index 876a7615c35d..bdb624dde38d 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -32,10 +32,11 @@ namespace oglcanvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XBitmapCanvas, ::com::sun::star::rendering::XIntegerBitmap > CanvasBitmapBase_Base; typedef ::canvas::IntegerBitmapBase< - ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, - BitmapCanvasHelper, - ::osl::MutexGuard, - ::cppu::OWeakObject > CanvasBitmapBaseT; + canvas::BitmapCanvasBase2< + ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + BitmapCanvasHelper, + ::osl::MutexGuard, + ::cppu::OWeakObject> > CanvasBitmapBaseT; class CanvasBitmap : public CanvasBitmapBaseT { diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 0c9970631adc..95dc3295917b 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -59,10 +59,12 @@ namespace vclcanvas DeviceHelper, tools::LocalGuard, ::cppu::OWeakObject > CanvasBase_Base; - typedef ::canvas::IntegerBitmapBase< CanvasBase_Base, - CanvasHelper, - tools::LocalGuard, - ::cppu::OWeakObject > CanvasBaseT; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + CanvasBase_Base, + CanvasHelper, + tools::LocalGuard, + ::cppu::OWeakObject> > CanvasBaseT; /** Product of this component's factory. diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 865996c05ab0..8cf013c9d9a0 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -48,10 +48,12 @@ namespace vclcanvas ::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; - typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, - CanvasBitmapHelper, - tools::LocalGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + CanvasBitmapHelper, + tools::LocalGuard, + ::cppu::OWeakObject> > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public RepaintTarget -- cgit