diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-04-08 16:44:28 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-04-08 16:47:25 +0200 |
| commit | 09b546cf9c1d0d9f78066e70a0348c7678cdcb14 (patch) | |
| tree | ea9fb80453a70202a8f8d4bff4710d92259ac5b1 /canvas/source/directx/dx_canvascustomsprite.hxx | |
| parent | Resolves: fdo#30729 and make initial font discovery much much faster (diff) | |
| download | core-09b546cf9c1d0d9f78066e70a0348c7678cdcb14.tar.gz core-09b546cf9c1d0d9f78066e70a0348c7678cdcb14.zip | |
Fix overloaded-virtual warning in canvas
With enabled -Woverloaded-virtual gcc warning (see
http://lists.freedesktop.org/archives/libreoffice/2011-March/009567.html),
canvas exposed a nasty clash between WeakComponentImplHelper::disposing
and XEventListener::disposing. Fixed by overriding *once* in baseclass,
and then calling disambiguated, renamed methods.
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 38b9bd85b2e4..8e6c534683ce 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -42,7 +42,7 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/basemutexhelper.hxx> +#include <canvas/base/disambiguationhelper.hxx> #include <canvas/base/canvascustomspritebase.hxx> #include "dx_sprite.hxx" @@ -75,7 +75,7 @@ namespace dxcanvas remain a base class that provides implementation, not to enforce any specific interface on its derivees. */ - class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, + class CanvasCustomSpriteSpriteBase_Base : public ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, public Sprite { }; @@ -111,7 +111,7 @@ namespace dxcanvas const ::canvas::ISurfaceProxyManagerSharedPtr& rSurfaceProxy, bool bShowSpriteBounds ); - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base |