summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-02 12:43:26 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-02 12:43:26 +0000
commita9581edb320994cb990d4d6334ae13cbbdfe00a8 (patch)
tree3c6319a2bf447e7566f1be9dbd3d04981386b85e /cppcanvas
parentf221d52d2ec751a3888c590f4ef20ced8d2eb1bf (diff)
INTEGRATION: CWS canvas02 (1.5.10); FILE MERGED
2005/10/09 09:19:16 thb 1.5.10.2: RESYNC: (1.5-1.6); FILE MERGED 2005/08/19 11:08:34 thb 1.5.10.1: #i53538# Changed clip setting to use basegfx polygon (cppcanvas::PolyPolygon contains reference back to canvas); changed direct access to base class member to getter method, thus, providing the actual XCanvas clip polygon lazily.
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 090f315dc0a9..a6054361d282 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: implcanvas.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:26:37 $
+ * last change: $Author: kz $ $Date: 2005-11-02 13:43:26 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -85,8 +85,8 @@ namespace cppcanvas
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 FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const;
@@ -106,8 +106,8 @@ namespace cppcanvas
// default: disabled assignment
ImplCanvas& operator=( const ImplCanvas& );
- ::com::sun::star::rendering::ViewState maViewState;
- PolyPolygonSharedPtr mpClipPolyPolygon;
+ mutable ::com::sun::star::rendering::ViewState maViewState;
+ ::basegfx::B2DPolyPolygon maClipPolyPolygon;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas;
};