diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 21:02:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 21:02:13 +0000 |
| commit | 1490c84bad0ef26b0d6efcfac5fcbabe1cc8d239 (patch) | |
| tree | f05e6fd9832266c736b557360b13ef0de4d05438 /canvas | |
| parent | 973bb936248d7c060305f625ef7e5ee9f21f5aa6 (diff) | |
INTEGRATION: CWS aw033 (1.13.14); FILE MERGED
2008/07/11 11:31:06 aw 1.13.14.5: RESYNC: (1.17-1.18); FILE MERGED
2008/05/14 13:29:14 aw 1.13.14.4: RESYNC: (1.15-1.17); FILE MERGED
2007/12/03 16:30:52 aw 1.13.14.3: RESYNC: (1.13-1.15); FILE MERGED
2007/11/22 15:08:12 aw 1.13.14.2: #i39532# polygon bezier changes
2007/11/20 12:56:29 aw 1.13.14.1: #i39532# adaptions to basegfx changes in aw033
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index c737ad2114ad..8f634d99bf7f 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: canvashelper.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -78,28 +78,28 @@ namespace vclcanvas { namespace { - ::basegfx::tools::B2DLineJoin b2DJoineFromJoin( sal_Int8 nJoinType ) + basegfx::B2DLineJoin b2DJoineFromJoin( sal_Int8 nJoinType ) { switch( nJoinType ) { case rendering::PathJoinType::NONE: - return ::basegfx::tools::B2DLINEJOIN_NONE; + return basegfx::B2DLINEJOIN_NONE; case rendering::PathJoinType::MITER: - return ::basegfx::tools::B2DLINEJOIN_MITER; + return basegfx::B2DLINEJOIN_MITER; case rendering::PathJoinType::ROUND: - return ::basegfx::tools::B2DLINEJOIN_ROUND; + return basegfx::B2DLINEJOIN_ROUND; case rendering::PathJoinType::BEVEL: - return ::basegfx::tools::B2DLINEJOIN_BEVEL; + return basegfx::B2DLINEJOIN_BEVEL; default: ENSURE_OR_THROW( false, "b2DJoineFromJoin(): Unexpected join type" ); } - return ::basegfx::tools::B2DLINEJOIN_NONE; + return basegfx::B2DLINEJOIN_NONE; } } @@ -343,6 +343,7 @@ namespace vclcanvas if( aPolyPoly.areControlPointsUsed() ) { + // AW: Not needed for ApplyLineDashing anymore; should be removed aPolyPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aPolyPoly); } @@ -356,9 +357,11 @@ namespace vclcanvas for( sal_uInt32 i=0; i<aPolyPoly.count(); ++i ) { - aDashedPolyPoly.append( - ::basegfx::tools::applyLineDashing( aPolyPoly.getB2DPolygon(i), - aDashArray ) ); + // AW: new interface; You may also get gaps in the same run now + basegfx::tools::applyLineDashing(aPolyPoly.getB2DPolygon(i), aDashArray, &aDashedPolyPoly); + //aDashedPolyPoly.append( + // ::basegfx::tools::applyLineDashing( aPolyPoly.getB2DPolygon(i), + // aDashArray ) ); } aPolyPoly = aDashedPolyPoly; @@ -387,10 +390,14 @@ namespace vclcanvas // StrokeAttributes, the // createAreaGeometryForLineStartEnd() method does not // seem to fit very well here - aStrokedPolyPoly.append( - ::basegfx::tools::createAreaGeometryForPolygon( aPolyPoly.getB2DPolygon(i), - strokeAttributes.StrokeWidth*0.5, - b2DJoineFromJoin(strokeAttributes.JoinType) ) ); + + // AW: New interface, will create bezier polygons now + aStrokedPolyPoly.append(basegfx::tools::createAreaGeometry( + aPolyPoly.getB2DPolygon(i), strokeAttributes.StrokeWidth*0.5, b2DJoineFromJoin(strokeAttributes.JoinType))); + //aStrokedPolyPoly.append( + // ::basegfx::tools::createAreaGeometryForPolygon( aPolyPoly.getB2DPolygon(i), + // strokeAttributes.StrokeWidth*0.5, + // b2DJoineFromJoin(strokeAttributes.JoinType) ) ); } } |