summaryrefslogtreecommitdiff
path: root/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-01-07 08:22:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-01-07 08:22:45 +0000
commitbda97595a63bc897b46673200dba8dfa9762b940 (patch)
treeb18e5ac725ae74d233849cc95c89ab1a1f6b4a2f /svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
parent26d4e54b84c088fc217559ec9008b37480f72c75 (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.cxx37
1 files changed, 17 insertions, 20 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index c2707e6700..279b2a37b4 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 }
}
}