diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:42:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:42:08 +0000 |
| commit | d62828d32d75dd6e90ef47ee8142285e10bc491f (patch) | |
| tree | ddb16d31078c23be2363d1567d1259791fa3cc3a /canvas/source/vcl | |
| parent | 9bc57eca692140fbb274e30af1601dccaa74735f (diff) | |
INTEGRATION: CWS thbpp9_SRC680 (1.8.28); FILE MERGED
2007/10/17 21:14:36 thb 1.8.28.1: #i82485# Carry clips along, also for XCachedPrimitive repaints
Diffstat (limited to 'canvas/source/vcl')
| -rw-r--r-- | canvas/source/vcl/canvashelper.hxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx index a477ca56a6db..df26e0e8c90e 100644 --- a/canvas/source/vcl/canvashelper.hxx +++ b/canvas/source/vcl/canvashelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: canvashelper.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2007-07-17 14:25:53 $ + * last change: $Author: hr $ $Date: 2007-11-01 14:42:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -282,10 +282,12 @@ namespace vclcanvas ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout(); /// Repaint a cached bitmap - bool repaint( const GraphicObjectSharedPtr& rGrf, - const ::Point& rPt, - const ::Size& rSz, - const GraphicAttr& rAttr ) const; + bool repaint( const GraphicObjectSharedPtr& rGrf, + const ::com::sun::star::rendering::ViewState& viewState, + const ::com::sun::star::rendering::RenderState& renderState, + const ::Point& rPt, + const ::Size& rSz, + const GraphicAttr& rAttr ) const; /** Flush drawing queue. @@ -303,7 +305,7 @@ namespace vclcanvas // returns transparency of color int setupOutDevState( const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, - ColorType eColorType ); + ColorType eColorType ) const; /** Called from XCanvas base classes, to notify that content is _about_ to change @@ -341,10 +343,10 @@ namespace vclcanvas const ::com::sun::star::rendering::RenderState& renderState, bool bModulateColors ); - bool setupTextOutput( ::Point& o_rOutPos, + bool setupTextOutput( ::Point& o_rOutPos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont ); + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont ) const; }; } |