INTEGRATION: CWS canvas05 (1.5.112); FILE MERGED

2008/05/21 13:32:04 thb 1.5.112.4: Made vcl and cairo canvas work with emf+ patches; smoothed out internal cairo makefile changes; corrected cairocanvas sprite update
2008/04/21 07:28:32 thb 1.5.112.3: RESYNC: (1.5-1.6); FILE MERGED
2007/12/20 22:18:59 thb 1.5.112.2: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
2007/10/01 13:02:03 thb 1.5.112.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom

1 files changed, 10 insertions, 5 deletions

diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 82aef7465e4a..9cd3f3718920 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: canvasbitmaphelper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -75,9 +75,13 @@ namespace vclcanvas
 
             @param rDevice
             Reference device for this canvas bitmap
+
+            @param rOutDevProvider
+            Reference output device. Used to create matching bitmap.
          */
-        void init( const BitmapEx&  rBitmap,
-                   SpriteCanvas&    rDevice );
+        void init( const BitmapEx&                              rBitmap,
+                   ::com::sun::star::rendering::XGraphicDevice& rDevice,
+                   const OutDevProviderSharedPtr&               rOutDevProvider );
 
 
         // Overridden CanvasHelper functionality
@@ -85,6 +89,8 @@ namespace vclcanvas
 
         void disposing();
 
+        void clear();
+
         ::com::sun::star::geometry::IntegerSize2D getSize();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
@@ -109,8 +115,6 @@ namespace vclcanvas
             getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette();
-
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
 
         /// @internal
@@ -121,6 +125,7 @@ namespace vclcanvas
         void setBitmap( const BitmapEx& rBitmap );
 
         BitmapBackBufferSharedPtr   mpBackBuffer;
+        OutDevProviderSharedPtr     mpOutDevReference;
     };
 }