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_canvas.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_canvas.hxx')
| -rw-r--r-- | canvas/source/directx/dx_canvas.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 760bd31aa244..32810ede36e5 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -45,7 +45,7 @@ #include <comphelper/uno3.hxx> #include <canvas/base/integerbitmapbase.hxx> -#include <canvas/base/basemutexhelper.hxx> +#include <canvas/base/disambiguationhelper.hxx> #include <canvas/base/graphicdevicebase.hxx> #include "dx_bitmapprovider.hxx" @@ -63,7 +63,7 @@ namespace dxcanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase1_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase1_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase1_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase1_Base; @@ -92,7 +92,7 @@ namespace dxcanvas void initialize(); /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base @@ -120,7 +120,7 @@ namespace dxcanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase2_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase2_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase2_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase2_Base; @@ -149,7 +149,7 @@ namespace dxcanvas void initialize(); /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base |