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_canvasbitmap.hxx | |
| parent | 781992cebac6415bdd38c78ae48806af156da09f (diff) | |
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_canvasbitmap.hxx')
| -rw-r--r-- | canvas/source/directx/dx_canvasbitmap.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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); |