From 84f66618d86d333030cb93ff7347f0e004ac492e Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 1 Nov 2007 13:40:19 +0000 Subject: INTEGRATION: CWS thbpp9_SRC680 (1.4.114); FILE MERGED 2007/10/17 21:14:36 thb 1.4.114.1: #i82485# Carry clips along, also for XCachedPrimitive repaints --- canvas/source/vcl/cachedbitmap.hxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'canvas/source/vcl/cachedbitmap.hxx') diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx index 0dd96b9c8db4..6b40c3c6469d 100644 --- a/canvas/source/vcl/cachedbitmap.hxx +++ b/canvas/source/vcl/cachedbitmap.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cachedbitmap.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:58:02 $ + * last change: $Author: hr $ $Date: 2007-11-01 14:40:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,13 +55,14 @@ namespace vclcanvas /** Create an XCachedPrimitive for given GraphicObject */ - CachedBitmap( const GraphicObjectSharedPtr& rGraphicObject, - const ::Point& rPoint, - const ::Size& rSize, - const GraphicAttr& rAttr, - const ::com::sun::star::rendering::ViewState& rUsedViewState, + CachedBitmap( const GraphicObjectSharedPtr& rGraphicObject, + const ::Point& rPoint, + const ::Size& rSize, + const GraphicAttr& rAttr, + 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(); @@ -75,6 +76,7 @@ namespace vclcanvas GraphicObjectSharedPtr mpGraphicObject; + const ::com::sun::star::rendering::RenderState maRenderState; const ::Point maPoint; const ::Size maSize; const GraphicAttr maAttributes; -- cgit