diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:39:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:39:11 +0000 |
| commit | 61f87fd6a477ed3d2a9b7780858c7faeb25ceb49 (patch) | |
| tree | 958cc291387a71a5a983a5bb38885cd5b659036d /cppcanvas | |
| parent | ec88e9f464df1fb1ac363b3558307b0a929b62a9 (diff) | |
INTEGRATION: CWS canvas02 (1.3.10); FILE MERGED
2005/10/09 09:10:28 thb 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2005/08/19 11:06:41 thb 1.3.10.1: #i53538# Changed clip setting to use basegfx polygon (cppcanvas::PolyPolygon contains reference back to canvas)
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/inc/canvasgraphichelper.hxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index 47245a8be56f..f94bbc50072a 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: canvasgraphichelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:16:50 $ + * last change: $Author: kz $ $Date: 2005-11-02 13:39:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,8 +67,8 @@ namespace cppcanvas // CanvasGraphic implementation virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); virtual ::basegfx::B2DHomMatrix getTransformation() const; - virtual void setClip( const PolyPolygonSharedPtr& rClipPoly ); - virtual PolyPolygonSharedPtr getClip() const; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); + virtual ::basegfx::B2DPolyPolygon getClip() const; virtual void setRGBAColor( Color::IntSRGBA ); virtual Color::IntSRGBA getRGBAColor() const; virtual void setCompositeOp( CompositeOp aOp ); @@ -77,14 +77,15 @@ namespace cppcanvas protected: // for our clients // =============== - CanvasSharedPtr getCanvas() const; + CanvasSharedPtr getCanvas() const; ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const; - - mutable ::com::sun::star::rendering::RenderState maRenderState; // for reasons of speed... + const ::com::sun::star::rendering::RenderState& getRenderState() const; private: - PolyPolygonSharedPtr mpClipPolyPolygon; - CanvasSharedPtr mpCanvas; + mutable ::com::sun::star::rendering::RenderState maRenderState; + + ::basegfx::B2DPolyPolygon maClipPolyPolygon; + CanvasSharedPtr mpCanvas; ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; }; |