From e609a82c39672a0582ea81b067ff398dbd135db7 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 24 Jun 2008 09:17:55 +0000 Subject: [PATCH] INTEGRATION: CWS canvas05 (1.2.94); FILE MERGED 2008/04/21 07:32:28 thb 1.2.94.3: RESYNC: (1.2-1.3); FILE MERGED 2008/04/02 22:56:26 thb 1.2.94.2: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII 2008/03/18 22:00:55 thb 1.2.94.1: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code --- canvas/source/cairo/cairo_cachedbitmap.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx index 64ea6bd6c533..e59ce3697228 100644 --- a/canvas/source/cairo/cairo_cachedbitmap.hxx +++ b/canvas/source/cairo/cairo_cachedbitmap.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cairo_cachedbitmap.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -45,11 +45,11 @@ namespace cairocanvas /** Create an XCachedPrimitive for given GraphicObject */ - CachedBitmap( ::cairo::Surface* pSurface, - const ::com::sun::star::rendering::ViewState& rUsedViewState, - const ::com::sun::star::rendering::RenderState& rUsedRenderState, + CachedBitmap( const ::cairo::SurfaceSharedPtr& pSurface, + const ::com::sun::star::rendering::ViewState& rUsedViewState, + const ::com::sun::star::rendering::RenderState& rUsedRenderState, const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas >& rTarget ); + ::com::sun::star::rendering::XCanvas >& rTarget ); /// Dispose all internal references virtual void SAL_CALL disposing(); @@ -62,7 +62,7 @@ namespace cairocanvas bool bSameViewTransform ); - ::cairo::Surface* mpSurface; + ::cairo::SurfaceSharedPtr mpSurface; const ::com::sun::star::rendering::RenderState maRenderState; }; }