Skip to content

C
core
Kaydet (Commit) d3eec71e authored tarafından Armin Le Grand's avatar Armin Le Grand
Dosyalara gözat
Seçenekler

Converted to unix lineends

üst 79fe1227
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
svx/source/customshapes/EnhancedCustomShape2d.cxx
Dosyayı görüntüle @ d3eec71e
...@@ -1495,36 +1495,36 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm ...@@ -1495,36 +1495,36 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
} }
break; break;
case QUADRATICCURVETO : case QUADRATICCURVETO :
{ {
for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( ( rSrcPt + 1 ) < nCoordSize ); i++ ) for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( ( rSrcPt + 1 ) < nCoordSize ); i++ )
{ {
if ( rSrcPt ) if ( rSrcPt )
{ {
const Point aPreviousEndPoint(GetPoint( seqCoordinates[ rSrcPt - 1 ], sal_True, sal_True)); const Point aPreviousEndPoint(GetPoint( seqCoordinates[ rSrcPt - 1 ], sal_True, sal_True));
const Point aControlQ(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True )); const Point aControlQ(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True ));
const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True )); const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True ));
const Point aControlA((aPreviousEndPoint + (aControlQ * 2)) / 3); const Point aControlA((aPreviousEndPoint + (aControlQ * 2)) / 3);
const Point aControlB(((aControlQ * 2) + aEnd) / 3); const Point aControlB(((aControlQ * 2) + aEnd) / 3);
DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!)"); DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!)");
aNewB2DPolygon.appendBezierSegment( aNewB2DPolygon.appendBezierSegment(
basegfx::B2DPoint(aControlA.X(), aControlA.Y()), basegfx::B2DPoint(aControlA.X(), aControlA.Y()),
basegfx::B2DPoint(aControlB.X(), aControlB.Y()), basegfx::B2DPoint(aControlB.X(), aControlB.Y()),
basegfx::B2DPoint(aEnd.X(), aEnd.Y())); basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
} }
else // no previous point , do a moveto else // no previous point , do a moveto
{ {
rSrcPt++; // skip control point rSrcPt++; // skip control point
const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True )); const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True ));
DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!)"); DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding Q control point (!)");
aNewB2DPolygon.append(basegfx::B2DPoint(aEnd.X(), aEnd.Y())); aNewB2DPolygon.append(basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
} }
} }
} }
break; break;
case ANGLEELLIPSE : case ANGLEELLIPSE :
{ {
if ( nPntCount ) if ( nPntCount )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment