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_canvas.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_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 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 |