diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 09:36:51 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 09:36:51 +0000 |
| commit | 10201d853a7dbdad32fd3cf3d9dd225d7f36d41d (patch) | |
| tree | d9b0485e995d2537c5697881084fa23216dade69 /svx/source/editeng | |
| parent | 1a7f19b61e5b1c9e6cd7da95911cd8ce8e271626 (diff) | |
INTEGRATION: CWS aw019 (1.6.426); FILE MERGED
2004/10/21 15:53:26 aw 1.6.426.1: #i34831#
Diffstat (limited to 'svx/source/editeng')
| -rw-r--r-- | svx/source/editeng/txtrange.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx index 632f79f66db8..d8c1205749d1 100644 --- a/svx/source/editeng/txtrange.cxx +++ b/svx/source/editeng/txtrange.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtrange.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2004-01-06 15:30:22 $ + * last change: $Author: pjunck $ $Date: 2004-11-03 10:36:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,14 @@ #include <tools/debug.hxx> #endif +#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX +#include <basegfx/polygon/b2dpolygon.hxx> +#endif + +#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX +#include <basegfx/polygon/b2dpolygontools.hxx> +#endif + /************************************************************************* |* |* TextRanger::TextRanger() @@ -108,9 +116,9 @@ TextRanger::TextRanger( const XPolyPolygon& rXPoly, const XPolyPolygon* pXLine, pPoly = new PolyPolygon( nCount ); for( USHORT i = 0; i < nCount; ++i ) { - Polygon aTmp = XOutCreatePolygon( rXPoly[ i ], NULL, 100 ); - nPointCount += aTmp.GetSize(); - pPoly->Insert( aTmp, i ); + ::basegfx::B2DPolygon aCandidate(::basegfx::tools::adaptiveSubdivideByAngle(rXPoly[ i ].getB2DPolygon())); + nPointCount += (sal_Int32)aCandidate.count(); + pPoly->Insert( Polygon(aCandidate), i ); } if( pXLine ) { @@ -118,9 +126,9 @@ TextRanger::TextRanger( const XPolyPolygon& rXPoly, const XPolyPolygon* pXLine, pLine = new PolyPolygon(); for( USHORT i = 0; i < nCount; ++i ) { - Polygon aTmp = XOutCreatePolygon( (*pXLine)[ i ], NULL, 100 ); - nPointCount += aTmp.GetSize(); - pLine->Insert( aTmp, i ); + ::basegfx::B2DPolygon aCandidate(::basegfx::tools::adaptiveSubdivideByAngle((*pXLine)[ i ].getB2DPolygon())); + nPointCount += (sal_Int32)aCandidate.count(); + pLine->Insert( Polygon(aCandidate), i ); } } else |