diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-07 08:22:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-07 08:22:45 +0000 |
| commit | ec286d5b7a3c709e6f99ae655f8f9c7d9edcd5a7 (patch) | |
| tree | 919ecacde2b6a2ec914ac00b886d8d624c7ff6da /svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | |
| parent | f8cb5d31b23ae7fed41046986fb706b8aa9fab0d (diff) | |
INTEGRATION: CWS sj13 (1.5.46); FILE MERGED
2004/12/08 14:25:13 sj 1.5.46.1: #i37895# also accepting 2d objects with shadow attribute
Diffstat (limited to 'svx/source/customshapes/EnhancedCustomShapeFontWork.cxx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index acbfe5ea8559..6ba3b2a3b14f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -2,9 +2,9 @@ * * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2004-11-18 11:03:07 $ + * last change: $Author: rt $ $Date: 2005-01-07 09:22:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -590,26 +590,23 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) SdrObject* pPartObj = aObjListIter.Next(); if ( pPartObj->ISA( SdrPathObj ) ) { - if (!((SdrShadowItem&)pPartObj->GetMergedItem( SDRATTR_SHADOW )).GetValue()) + const XPolyPolygon& rXPolyPoly = ((SdrPathObj*)pPartObj)->GetPathPoly(); + ::basegfx::B2DPolyPolygon aCandidate(rXPolyPoly.getB2DPolyPolygon()); + if(aCandidate.areControlPointsUsed()) { - const XPolyPolygon& rXPolyPoly = ((SdrPathObj*)pPartObj)->GetPathPoly(); - ::basegfx::B2DPolyPolygon aCandidate(rXPolyPoly.getB2DPolyPolygon()); - if(aCandidate.areControlPointsUsed()) - { - aCandidate = ::basegfx::tools::adaptiveSubdivideByAngle(aCandidate); - } - aOutlines2d.append(aCandidate); - -//BFS09 sal_uInt16 i, nCount = rXPolyPoly.Count(); -//BFS09 for ( i = 0; i < nCount; i++ ) -//BFS09 { -//BFS09//BFS09 Polygon aPoly( XOutCreatePolygonBezier( rXPolyPoly.GetObject( i ), NULL ) ); -//BFS09 Polygon aPoly( XOutCreatePolygonBezier( rXPolyPoly.GetObject( i )) ); -//BFS09 Polygon aSimplePoly; -//BFS09 aPoly.GetSimple( aSimplePoly ); -//BFS09 aOutlines2d.Insert( aSimplePoly, POLYPOLY_APPEND ); -//BFS09 } + aCandidate = ::basegfx::tools::adaptiveSubdivideByAngle(aCandidate); } + aOutlines2d.append(aCandidate); + +//BFS09 sal_uInt16 i, nCount = rXPolyPoly.Count(); +//BFS09 for ( i = 0; i < nCount; i++ ) +//BFS09 { +//BFS09//BFS09 Polygon aPoly( XOutCreatePolygonBezier( rXPolyPoly.GetObject( i ), NULL ) ); +//BFS09 Polygon aPoly( XOutCreatePolygonBezier( rXPolyPoly.GetObject( i )) ); +//BFS09 Polygon aSimplePoly; +//BFS09 aPoly.GetSimple( aSimplePoly ); +//BFS09 aOutlines2d.Insert( aSimplePoly, POLYPOLY_APPEND ); +//BFS09 } } } |