INTEGRATION: CWS canvas05 (1.3.26); FILE MERGED

2008/04/21 07:32:46 thb 1.3.26.3: RESYNC: (1.3-1.4); FILE MERGED
2008/04/02 22:56:28 thb 1.3.26.2: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII
2008/03/18 22:00:57 thb 1.3.26.1: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code

canvas/source/cairo/cairo_spritehelper.hxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cairo_spritehelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,7 +83,7 @@ namespace cairocanvas
 
         void disposing();
 
-        void setSurface( ::cairo::Surface* pBufferSurface );
+        void setSurface( const ::cairo::SurfaceSharedPtr& pBufferSurface );
 
         /** Repaint sprite content to associated sprite canvas
 
@@ -99,7 +99,7 @@ namespace cairocanvas
             the front buffer, but within a VDev. Used to speed up
             drawing.
          */
-        void redraw( ::cairo::Cairo*            pCairo,
+        void redraw( const ::cairo::CairoSharedPtr& pCairo,
                      const ::basegfx::B2DPoint&     rPos,
                      bool&                          bSurfacesDirty,
                      bool                           bBufferedUpdate ) const;
@@ -110,9 +110,8 @@ namespace cairocanvas
 
 
         SpriteCanvasRef           mpSpriteCanvas;
+        ::cairo::SurfaceSharedPtr mpBufferSurface;
         mutable bool              mbTextureDirty;  // when true, texture needs update
-
-    ::cairo::Surface* mpBufferSurface;
     };
 }