From 19edde184077eca38ce369304980a8a42fb3ab52 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 12 Mar 2014 10:06:42 +0100
Subject: 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
---
 canvas/source/directx/dx_canvas.hxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'canvas/source/directx/dx_canvas.hxx')

diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index 78e63ffef1d6..cf4e7ad64377 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -115,10 +115,12 @@ namespace dxcanvas
                                            DeviceHelper,
                                            ::osl::MutexGuard,
                                            ::cppu::OWeakObject >    CanvasBase2_Base;
-    typedef ::canvas::IntegerBitmapBase< CanvasBase2_Base,
-                                         BitmapCanvasHelper,
-                                         ::osl::MutexGuard,
-                                         ::cppu::OWeakObject >      BitmapCanvasBaseT;
+    typedef ::canvas::IntegerBitmapBase<
+        canvas::BitmapCanvasBase2<
+            CanvasBase2_Base,
+            BitmapCanvasHelper,
+            ::osl::MutexGuard,
+            ::cppu::OWeakObject> > BitmapCanvasBaseT;
 
     /** Product of this component's factory.
 
-- 
cgit