From 21ec9beae29b19b8ec6f0a16fd0e708e4f210208 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Tue, 31 Jan 2012 01:04:10 +0100
Subject: XCanvas does no longer imply XBitmapCanvas

Remove the implication that XCanvas IS-A XBitmapCanvas, i.e. one can
access underlying pixels. That's a preparation for display-list based
canvas implementations, and was a rather silly assumption in the first
place.

Also fixes up all client sites.

Change-Id: I7a3d6f68ef46fe94b23cce7759cc0b8b6ca4dae9
---
 cppcanvas/source/wrapper/implspritecanvas.cxx | 4 ----
 cppcanvas/source/wrapper/implspritecanvas.hxx | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'cppcanvas')

diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index c6b43a6a9af1..78701786fe15 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -51,8 +51,6 @@ namespace cppcanvas
         ImplSpriteCanvas::ImplSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) :
             ImplCanvas( uno::Reference< rendering::XCanvas >(rCanvas,
                                                              uno::UNO_QUERY) ),
-            ImplBitmapCanvas( uno::Reference< rendering::XBitmapCanvas >(rCanvas,
-                                                                         uno::UNO_QUERY) ),
             mxSpriteCanvas( rCanvas ),
             mpTransformArbiter( new TransformationArbiter() )
         {
@@ -61,10 +59,8 @@ namespace cppcanvas
 
         ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) :
             Canvas(),
-            BitmapCanvas(),
             SpriteCanvas(),
             ImplCanvas( rOrig ),
-            ImplBitmapCanvas( rOrig ),
             mxSpriteCanvas( rOrig.getUNOSpriteCanvas() ),
             mpTransformArbiter( new TransformationArbiter() )
         {
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 2e70b9aa42f1..1999c5630ff0 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -29,14 +29,14 @@
 
 #include <cppcanvas/spritecanvas.hxx>
 
-#include <implbitmapcanvas.hxx>
+#include <implcanvas.hxx>
 
 
 namespace cppcanvas
 {
     namespace internal
     {
-        class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas
+        class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
         {
         public:
             ImplSpriteCanvas( const ::com::sun::star::uno::Reference<
-- 
cgit