From 268be3ac88bd9572b2402ecdb7bed04038fe6999 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 12 Mar 2014 11:48:17 +0100 Subject: Mark overriding DisambiguationHelper class template mem funs as SAL_OVERRIDE ...which reveals that some uses are not derived from XEventListener, so re- introduce BaseMutexHelper as an alternative (which originally got superseded by DisambiguationHelper in 09b546cf9c1d0d9f78066e70a0348c7678cdcb14 "Fix overloaded-virtual warning in canvas"). Change-Id: I1418370733b72526ec481b70fa69f03e7c28b7ce --- canvas/source/cairo/cairo_canvas.hxx | 6 +++--- canvas/source/cairo/cairo_canvasbitmap.hxx | 5 +++-- canvas/source/cairo/cairo_canvascustomsprite.hxx | 6 +++--- canvas/source/cairo/cairo_spritecanvas.hxx | 2 +- canvas/source/directx/dx_canvas.hxx | 10 +++++----- canvas/source/directx/dx_canvasbitmap.hxx | 6 +++--- canvas/source/directx/dx_canvascustomsprite.hxx | 6 +++--- canvas/source/directx/dx_spritecanvas.hxx | 2 +- canvas/source/opengl/ogl_canvasbitmap.hxx | 6 +++--- canvas/source/opengl/ogl_canvascustomsprite.hxx | 6 +++--- canvas/source/opengl/ogl_spritecanvas.hxx | 2 +- canvas/source/vcl/canvas.hxx | 6 +++--- canvas/source/vcl/canvasbitmap.hxx | 3 ++- canvas/source/vcl/canvascustomsprite.hxx | 4 ++-- canvas/source/vcl/spritecanvas.hxx | 2 +- 15 files changed, 37 insertions(+), 35 deletions(-) (limited to 'canvas') diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 945bf5f2b568..96eb1e715c3b 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include @@ -60,7 +60,7 @@ namespace cairocanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase_Base; @@ -116,7 +116,7 @@ namespace cairocanvas ~Canvas(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index f67a955daded..1f074cf0292a 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -32,6 +32,7 @@ #include +#include #include #include "cairo_cairo.hxx" @@ -49,7 +50,7 @@ namespace cairocanvas ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; class CanvasBitmapSpriteSurface_Base : - public ::canvas::DisambiguationHelper, + public ::canvas::BaseMutexHelper, public SurfaceProvider { }; @@ -79,7 +80,7 @@ namespace cairocanvas bool bHasAlpha ); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 65e0040a0870..5a324881b032 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "cairo_sprite.hxx" @@ -67,7 +67,7 @@ namespace cairocanvas remain a base class that provides implementation, not to enforce any specific interface on its derivees. */ - class CanvasCustomSpriteSpriteBase_Base : public ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, + class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, public Sprite, public SurfaceProvider { @@ -102,7 +102,7 @@ namespace cairocanvas CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rRefDevice ); - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 6869881e7a42..95ff09f08ce4 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -113,7 +113,7 @@ namespace cairocanvas void initialize(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index cf4e7ad64377..5467c2d1eeb8 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include "dx_bitmapprovider.hxx" @@ -54,7 +54,7 @@ namespace dxcanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase1_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase1_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase1_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase1_Base; @@ -83,7 +83,7 @@ namespace dxcanvas void initialize(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base @@ -111,7 +111,7 @@ namespace dxcanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase2_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase2_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase2_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase2_Base; @@ -142,7 +142,7 @@ namespace dxcanvas void initialize(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index bffcf1f433ca..680848dca23e 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "dx_bitmapprovider.hxx" @@ -53,7 +53,7 @@ namespace dxcanvas ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; typedef ::canvas::IntegerBitmapBase< canvas::BitmapCanvasBase2< - ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, BitmapCanvasHelper, ::osl::MutexGuard, ::cppu::OWeakObject> > CanvasBitmap_Base; @@ -73,7 +73,7 @@ namespace dxcanvas const DeviceRef& rDevice ); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index ec25ab18c578..ad94a90709e9 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "dx_sprite.hxx" @@ -66,7 +66,7 @@ namespace dxcanvas remain a base class that provides implementation, not to enforce any specific interface on its derivees. */ - class CanvasCustomSpriteSpriteBase_Base : public ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, + class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, public Sprite { }; @@ -102,7 +102,7 @@ namespace dxcanvas const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy, bool bShowSpriteBounds ); - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index 18966f151c49..8bf7f5977c98 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -108,7 +108,7 @@ namespace dxcanvas void initialize(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index bdb624dde38d..534837a24127 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include @@ -33,7 +33,7 @@ namespace oglcanvas ::com::sun::star::rendering::XIntegerBitmap > CanvasBitmapBase_Base; typedef ::canvas::IntegerBitmapBase< canvas::BitmapCanvasBase2< - ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, BitmapCanvasHelper, ::osl::MutexGuard, ::cppu::OWeakObject> > CanvasBitmapBaseT; @@ -59,7 +59,7 @@ namespace oglcanvas CanvasBitmap( const CanvasBitmap& rSrc ); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; /** Write out recorded actions */ diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index 8d9721e5efe1..161dfc075d8e 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include "ogl_spritecanvas.hxx" #include "ogl_canvashelper.hxx" @@ -32,7 +32,7 @@ namespace oglcanvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCustomSprite, ::com::sun::star::rendering::XCanvas > CanvasCustomSpriteBase_Base; typedef ::canvas::CanvasBase< - ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, + ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, CanvasHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasCustomSpriteBaseT; @@ -60,7 +60,7 @@ namespace oglcanvas const SpriteCanvasRef& rRefDevice, SpriteDeviceHelper& rDeviceHelper ); - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // XSprite virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index f59bc8bb9c2c..f657c26da59a 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -75,7 +75,7 @@ namespace oglcanvas void initialize(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 95dc3295917b..1f005c450e6b 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include @@ -55,7 +55,7 @@ namespace vclcanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >, DeviceHelper, tools::LocalGuard, ::cppu::OWeakObject > CanvasBase_Base; @@ -90,7 +90,7 @@ namespace vclcanvas ~Canvas(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 8cf013c9d9a0..2f2988ffd2ba 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -32,6 +32,7 @@ #include +#include #include #include @@ -50,7 +51,7 @@ namespace vclcanvas ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; typedef ::canvas::IntegerBitmapBase< canvas::BitmapCanvasBase2< - ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, CanvasBitmapHelper, tools::LocalGuard, ::cppu::OWeakObject> > CanvasBitmap_Base; diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 3b8dbd6de822..0c0a1bb5d4f8 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include @@ -68,7 +68,7 @@ namespace vclcanvas remain a base class that provides implementation, not to enforce any specific interface on its derivees. */ - class CanvasCustomSpriteSpriteBase_Base : public ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, + class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, public Sprite { }; diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 92dc4daeb2cd..6d99798ef3eb 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -115,7 +115,7 @@ namespace vclcanvas ~SpriteCanvas(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base -- cgit