diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:58:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:58:02 +0000 |
| commit | b9378bed6823ffb8449dc01043f85b1da71ad6ef (patch) | |
| tree | 403b03490baa6c210865e31cf2b37219a20d561a /svx/inc/txtrange.hxx | |
| parent | 4cb74f889ae1f2941ed921485f7e516f1c29677f (diff) | |
INTEGRATION: CWS aw024 (1.4.196); FILE MERGED
2006/10/27 12:13:24 aw 1.4.196.4: #i39528# ::basegfx -> basegfx adaption
2005/09/18 01:10:19 aw 1.4.196.3: RESYNC: (1.4-1.5); FILE MERGED
2005/05/25 09:47:04 aw 1.4.196.2: #i39529#
2005/04/26 15:03:25 aw 1.4.196.1: #i39528#
Diffstat (limited to 'svx/inc/txtrange.hxx')
| -rw-r--r-- | svx/inc/txtrange.hxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx index 5f4bf3b5e95e..ad4b1de2361a 100644 --- a/svx/inc/txtrange.hxx +++ b/svx/inc/txtrange.hxx @@ -4,9 +4,9 @@ * * $RCSfile: txtrange.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:21:27 $ + * last change: $Author: ihi $ $Date: 2006-11-14 12:58:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,7 +47,6 @@ #endif class PolyPolygon; -class XPolyPolygon; class Range; class Rectangle; @@ -66,8 +65,8 @@ class SVX_DLLPUBLIC TextRanger { Range *pRangeArr; SvLongsPtr *pCache; - PolyPolygon *pPoly; // Flaechenpolygon - PolyPolygon *pLine; // Linienpolygon + PolyPolygon *mpPolyPolygon; // Flaechenpolygon + PolyPolygon *mpLinePolyPolygon; // Linienpolygon Rectangle *pBound; // Umfassendes Rechteck USHORT nCacheSize; // Cache-Size USHORT nCacheIdx; // Cache-Index @@ -75,7 +74,7 @@ class SVX_DLLPUBLIC TextRanger USHORT nLeft; // Abstand Text-Kontur USHORT nUpper; // Abstand Kontur-Text USHORT nLower; // Abstand Text-Kontur - USHORT nPointCount; // Anzahl der Polygonpunkte + sal_uInt32 nPointCount; // Anzahl der Polygonpunkte BOOL bSimple : 1; // Nur Aussenkante BOOL bInner : 1; // TRUE: Objekt beschriften (EditEngine); // FALSE: Objekt umfliessen (StarWriter); @@ -88,7 +87,7 @@ class SVX_DLLPUBLIC TextRanger TextRanger( const TextRanger& ); // not implemented const Rectangle& _GetBoundRect(); public: - TextRanger( const XPolyPolygon& rXPoly, const XPolyPolygon* pXLine, + TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon, USHORT nCacheSize, USHORT nLeft, USHORT nRight, BOOL bSimple, BOOL bInner, BOOL bVert = sal_False ); ~TextRanger(); @@ -97,13 +96,13 @@ public: USHORT GetLeft() const { return nLeft; } USHORT GetUpper() const { return nUpper; } USHORT GetLower() const { return nLower; } - USHORT GetPointCount() const { return nPointCount; } + sal_uInt32 GetPointCount() const { return nPointCount; } BOOL IsSimple() const { return bSimple; } BOOL IsInner() const { return bInner; } BOOL IsVertical() const { return bVertical; } BOOL HasBorder() const { return nRight || nLeft; } - const PolyPolygon& GetPolyPolygon() const { return *pPoly; } - const PolyPolygon* GetLinePolygon() const { return pLine; } + const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } + const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } const Rectangle& GetBoundRect() { return pBound ? *pBound : _GetBoundRect(); } void SetUpper( USHORT nNew ){ nUpper = nNew; } |