diff options
22 files changed, 119 insertions, 52 deletions
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 <comphelper/uno3.hxx> #include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/bufferedgraphicdevicebase.hxx> #include <basegfx/vector/b2isize.hxx> @@ -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 <boost/shared_ptr.hpp> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> #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<CanvasBitmapBase_Base>, + public ::canvas::BaseMutexHelper<CanvasBitmapBase_Base>, 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 <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/canvascustomspritebase.hxx> #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 <comphelper/uno3.hxx> #include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/graphicdevicebase.hxx> #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 <cppuhelper/compbase3.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> #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 <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/canvascustomspritebase.hxx> #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 <com/sun/star/rendering/XIntegerBitmap.hpp> #include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <basegfx/vector/b2isize.hxx> #include <boost/shared_ptr.hpp> @@ -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 <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #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 <cppuhelper/compbase7.hxx> #include <comphelper/uno3.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> #include <canvas/base/graphicdevicebase.hxx> @@ -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 <canvas/vclwrapper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/integerbitmapbase.hxx> #include <canvasbitmaphelper.hxx> @@ -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 <vcl/virdev.hxx> #include <canvas/vclwrapper.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/spritesurface.hxx> #include <canvas/base/canvascustomspritebase.hxx> @@ -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 diff --git a/include/canvas/base/basemutexhelper.hxx b/include/canvas/base/basemutexhelper.hxx new file mode 100644 index 000000000000..d780d54a95f0 --- /dev/null +++ b/include/canvas/base/basemutexhelper.hxx @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_CANVAS_BASE_BASEMUTEXHELPER_HXX +#define INCLUDED_CANVAS_BASE_BASEMUTEXHELPER_HXX + +#include <sal/config.h> + +#include <osl/mutex.hxx> + +/* Definition of the BaseMutexHelper class */ + +namespace canvas +{ + /** Base class, initializing its own baseclass with m_aMutex. + + This is necessary to make the CanvasBase, GraphicDeviceBase, + etc. classes freely combinable - letting them perform this + initialization would prohibit deriving e.g. CanvasBase from + GraphicDeviceBase. + */ + template< class Base > class BaseMutexHelper : public Base + { + protected: + /** Construct BaseMutexHelper + + This method is the whole purpose of this template: + initializing a base class with the provided m_aMutex + member (the WeakComponentImplHelper templates need that, + as they require the lifetime of the mutex to extend + theirs). + */ + BaseMutexHelper() : + Base( m_aMutex ) + { + } + + virtual void disposeThis() {} + + mutable osl::Mutex m_aMutex; + + private: + virtual void SAL_CALL disposing() SAL_OVERRIDE + { disposeThis(); } + }; +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx index 0eec72a2b2bb..f7ba97c83eca 100644 --- a/include/canvas/base/bufferedgraphicdevicebase.hxx +++ b/include/canvas/base/bufferedgraphicdevicebase.hxx @@ -176,7 +176,7 @@ namespace canvas return ::com::sun::star::uno::makeAny(mxWindow); } - virtual void disposeThis() + virtual void disposeThis() SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -224,7 +224,7 @@ namespace canvas } // XWindowListener - virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) + virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 64681eb5939c..4a3944b021a6 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -111,7 +111,7 @@ namespace canvas { } - virtual void disposeThis() + virtual void disposeThis() SAL_OVERRIDE { MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index b244e6424655..8caa2589970f 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -94,7 +94,7 @@ namespace canvas @derive when overriding this method in derived classes, <em>always</em> call the base class' method! */ - virtual void disposeThis() + virtual void disposeThis() SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx index 2a19db1a9053..9b07498cb754 100644 --- a/include/canvas/base/disambiguationhelper.hxx +++ b/include/canvas/base/disambiguationhelper.hxx @@ -44,9 +44,7 @@ namespace canvas */ template< class Base > class DisambiguationHelper : public Base { - public: - typedef Base BaseType; - + protected: /** Construct DisambiguationHelper This method is the whole purpose of this template: @@ -56,23 +54,24 @@ namespace canvas theirs). */ DisambiguationHelper() : - BaseType( m_aMutex ) + Base( m_aMutex ) { } - virtual void SAL_CALL disposing() - { disposeThis(); } - - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) - { disposeEventSource(Source); } - virtual void disposeThis() {} virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) {} -protected: mutable ::osl::Mutex m_aMutex; + + private: + virtual void SAL_CALL disposing() SAL_OVERRIDE + { disposeThis(); } + + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + { disposeEventSource(Source); } + }; } diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index df8551fcdc31..69a4c2fc35bb 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -136,7 +136,7 @@ namespace canvas _1))); } - virtual void disposeThis() + virtual void disposeThis() SAL_OVERRIDE { MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index 4bc030e0dab7..c45b34fd4fb5 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -77,7 +77,7 @@ namespace canvas { } - virtual void disposeThis() + virtual void disposeThis() SAL_OVERRIDE { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); |