diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-12 10:06:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-12 16:24:38 +0100 |
| commit | 19edde184077eca38ce369304980a8a42fb3ab52 (patch) | |
| tree | 1a15b76d09c8da2d843c03015c6391cf61e8cca3 /canvas/source/vcl | |
| parent | 970160f78ef6cc7abacfa252daa8451e1f0117bb (diff) | |
Mark overriding BitmapCanvasBase class template member funs as SAL_OVERRIDE
...which reveals that SpriteCanvasBase is not derived from XBitmapCanvas, so
split up BitmapCanvasBase (just XBitmap) and BitmapCanvasBase2 (plus
XBitmapCanvas) and make IntegerBitmapBase directly abstract over those two as
arguments.
Change-Id: Ieae87fe466bb9f1a861c8a95162ef25235ae5799
Diffstat (limited to 'canvas/source/vcl')
| -rw-r--r-- | canvas/source/vcl/canvas.hxx | 10 | ||||
| -rw-r--r-- | canvas/source/vcl/canvasbitmap.hxx | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 0c9970631adc..95dc3295917b 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -59,10 +59,12 @@ namespace vclcanvas DeviceHelper, tools::LocalGuard, ::cppu::OWeakObject > CanvasBase_Base; - typedef ::canvas::IntegerBitmapBase< CanvasBase_Base, - CanvasHelper, - tools::LocalGuard, - ::cppu::OWeakObject > CanvasBaseT; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + CanvasBase_Base, + CanvasHelper, + tools::LocalGuard, + ::cppu::OWeakObject> > CanvasBaseT; /** Product of this component's factory. diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 865996c05ab0..8cf013c9d9a0 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -48,10 +48,12 @@ namespace vclcanvas ::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XFastPropertySet > CanvasBitmapBase_Base; - typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, - CanvasBitmapHelper, - tools::LocalGuard, - ::cppu::OWeakObject > CanvasBitmap_Base; + typedef ::canvas::IntegerBitmapBase< + canvas::BitmapCanvasBase2< + ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, + CanvasBitmapHelper, + tools::LocalGuard, + ::cppu::OWeakObject> > CanvasBitmap_Base; class CanvasBitmap : public CanvasBitmap_Base, public RepaintTarget |