[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - svx/source

[Tor Lillqvist]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a66b98d27e04803335e563dd0810ccfc4a0efc4d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 14 22:53:53 2017 +0200

    tdf#106011: The "swing angle" is negative when counter-clockwise
    
    Change-Id: I1ef77e4c8cf0a6d31b36411a79b576115c32c644
    (cherry picked from commit 34d8dc19a08e2752a4b8d3b3d83b7cf3ac341f1c)

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 8ed0518..d8a3e78 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1796,7 +1796,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                                     << aStartPoint.Y() << " end: "
                                     << aEndPoint.X() << ", " << aEndPoint.Y()
                                     << " clockwise: " << int(bClockwise));
-                            basegfx::B2DPolygon aArc = CreateArc( aRect, bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, aStartPoint == aEndPoint && fSwingAngle > F_PI);
+                            basegfx::B2DPolygon aArc = CreateArc( aRect, bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, aStartPoint == aEndPoint && ((bClockwise && fSwingAngle > F_PI) || (!bClockwise && fSwingAngle < -F_PI)));
                             // Now that we have the arc, move it to aStartPointB2D.
                             basegfx::B2DHomMatrix aMatrix = basegfx::tools::createTranslateB2DHomMatrix(aStartPointB2D.getX(), aStartPointB2D.getY());
                             aArc.transform(aMatrix);