diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-12 11:48:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-12 16:24:39 +0100 |
| commit | 268be3ac88bd9572b2402ecdb7bed04038fe6999 (patch) | |
| tree | 5e6ff301b50af52eac62eddd0ccaea143492e86a /canvas/source/directx/dx_canvascustomsprite.hxx | |
| parent | Mark overriding SpriteCanvasBase class template member funs as SAL_OVERRIDE (diff) | |
| download | core-268be3ac88bd9572b2402ecdb7bed04038fe6999.tar.gz core-268be3ac88bd9572b2402ecdb7bed04038fe6999.zip | |
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
Diffstat (limited to 'canvas/source/directx/dx_canvascustomsprite.hxx')
| -rw-r--r-- | canvas/source/directx/dx_canvascustomsprite.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |