diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 09:17:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 09:17:24 +0000 |
| commit | dbf84e82cc9f5033c944402e16c1035e58cdc334 (patch) | |
| tree | 84bb960278d03506bb707e6ac4992287c6fc4dd6 /svx/source/svdraw/svdobj.cxx | |
| parent | bbc82acb3cc38807c7667e05fd8fa3f92dc3568c (diff) | |
INTEGRATION: CWS vcl55 (1.77.50); FILE MERGED
2006/03/15 10:36:05 pl 1.77.50.2: solved a Windows compile problem
2006/02/27 14:30:57 pl 1.77.50.1: #i62424# add linejoint and miterlimit to SvtGraphicsStroke
Diffstat (limited to 'svx/source/svdraw/svdobj.cxx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index b2f4cf87de9a..79e53d979adb 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdobj.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: kz $ $Date: 2006-02-01 19:01:54 $ + * last change: $Author: obo $ $Date: 2006-03-22 10:17:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XComponent.hpp> #endif +#define _USE_MATH_DEFINES #include <math.h> #include <vcl/metaact.hxx> // fuer TakeContour #include <vcl/cvtsvm.hxx> @@ -1260,14 +1261,33 @@ void SdrObject::ImpDrawLineGeometry( XOutputDevice& rXOut, //BFS09 SvtGraphicStroke aStroke( XOutCreatePolygonBezier( aPolyPoly[0] ), //BFS09 XOutCreatePolygonBezier( aStartPoly ), //BFS09 XOutCreatePolygonBezier( aEndPoly ), + SvtGraphicStroke::JoinType eJoin; + double fMiterLength = rLineParameters.GetLineWidth(); + switch( rLineParameters.GetLineJoint() ) + { + case XLINEJOINT_NONE: eJoin = SvtGraphicStroke::joinNone;break; + case XLINEJOINT_MIDDLE: + case XLINEJOINT_MITER: + { + eJoin = SvtGraphicStroke::joinMiter; + // assume GetLinejointMiterMinimumAngle returns degrees (currently returns 15.0) + double fSin = rtl::math::sin( M_PI * rLineParameters.GetLinejointMiterMinimumAngle() / 360.0 ); + if( ! rtl::math::isNan( fSin ) ) + fMiterLength /= fSin; + } + break; + case XLINEJOINT_BEVEL: eJoin = SvtGraphicStroke::joinBevel;break; + default: + case XLINEJOINT_ROUND: eJoin = SvtGraphicStroke::joinRound;break; + } SvtGraphicStroke aStroke( static_cast<Polygon>(aPolyPoly[0].getB2DPolygon()), Polygon(aStartPoly.getB2DPolygon()), Polygon(aEndPoly.getB2DPolygon()), nTransparence / 100.0, rLineParameters.GetLineWidth(), SvtGraphicStroke::capButt, - SvtGraphicStroke::joinRound, - rLineParameters.GetLinejointMiterMinimumAngle(), + eJoin, + fMiterLength, //BFS06 rLineParameters.GetLineStyle() == XLINE_DASH ? rLineParameters.GetDotDash() : SvtGraphicStroke::DashArray() ); rLineParameters.IsLineStyleSolid() ? SvtGraphicStroke::DashArray() : rLineParameters.GetDotDash() ); |