diff options
Diffstat (limited to 'drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index ff128619019f..e116b6d9b1bc 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrlatheprimitive3d.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: aw $ $Date: 2008-05-14 09:21:53 $ + * last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,33 +36,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX #include <drawinglayer/primitive3d/sdrlatheprimitive3d.hxx> -#endif - -#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX #include <basegfx/matrix/b2dhommatrix.hxx> -#endif - -#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX #include <basegfx/polygon/b2dpolygontools.hxx> -#endif - -#ifndef _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX #include <basegfx/polygon/b3dpolypolygontools.hxx> -#endif - -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx> -#endif - -#ifndef _BGFX_TOOLS_CANVASTOOLS_HXX #include <basegfx/tools/canvastools.hxx> -#endif - -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_PRIMITIVETYPES3D_HXX #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// @@ -219,12 +199,17 @@ namespace drawinglayer } } +#ifdef DBG_UTIL return EventuallyAddTestRange(aRetval); +#else + return aRetval; +#endif } void SdrLathePrimitive3D::impCreateSlices() { - // prepare the polygon + // prepare the polygon. No double points, correct orientations and a correct + // outmost polygon are needed basegfx::B2DPolyPolygon aCandidate(basegfx::tools::adaptiveSubdivideByAngle(getPolyPolygon())); aCandidate.removeDoublePoints(); aCandidate = basegfx::tools::correctOrientations(aCandidate); @@ -233,7 +218,7 @@ namespace drawinglayer // check edge count of first sub-polygon. If different, reSegment polyPolygon. This ensures // that for polyPolygons, the subPolys 1..n only get reSegmented when polygon 0L is different // at all (and not always) - const basegfx::B2DPolygon aSubCandidate(aCandidate.getB2DPolygon(0L)); + const basegfx::B2DPolygon aSubCandidate(aCandidate.getB2DPolygon(0)); const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1L : 0L)); if(nSubEdgeCount != getVerticalSegments()) |