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/cairo/cairo_canvas.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/cairo/cairo_canvas.hxx')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 945bf5f2b568..96eb1e715c3b 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -38,7 +38,7 @@ #include <comphelper/uno3.hxx> #include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/disambiguationhelper.hxx> +#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/bufferedgraphicdevicebase.hxx> #include <basegfx/vector/b2isize.hxx> @@ -60,7 +60,7 @@ namespace cairocanvas ::com::sun::star::util::XUpdatable, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; - typedef ::canvas::GraphicDeviceBase< ::canvas::DisambiguationHelper< GraphicDeviceBase_Base >, + typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< GraphicDeviceBase_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBase_Base; @@ -116,7 +116,7 @@ namespace cairocanvas ~Canvas(); /// Dispose all internal references - virtual void disposeThis(); + virtual void disposeThis() SAL_OVERRIDE; // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base |