diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
commit | c87019c1a938d7bb4ba1575f79df20f94a619ca9 (patch) | |
tree | 76f3d71ea01469e16f365f145cdeb464983aebd9 /canvas | |
parent | link to the correct libraries on *BSD too (diff) | |
parent | fix for 3.3.2 blocker fdo#34718 - change the type of nDrawerHeight to long (diff) | |
download | core-c87019c1a938d7bb4ba1575f79df20f94a619ca9.tar.gz core-c87019c1a938d7bb4ba1575f79df20f94a619ca9.zip |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
svtools/source/control/toolbarmenu.cxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/unx/inc/saldata.hxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 5de2d4ccf789..2f1e39b8a19e 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1079,7 +1079,7 @@ namespace cairocanvas { const sal_uInt32 nNextIndex((b + 1) % nPointCount); aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex)); - aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b)); + aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b % nPointCount)); aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex)); doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge), |