From 6f84ac0e57c3d1bd9d22efe95aea5d89cf8815c9 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 19 Aug 2008 23:04:49 +0000 Subject: [PATCH] INTEGRATION: CWS aw033 (1.6.6); FILE MERGED 2008/05/27 14:08:46 aw 1.6.6.3: #i39532# changes DEV300 m12 resync corrections 2008/05/14 14:41:24 aw 1.6.6.2: RESYNC: (1.6-1.7); FILE MERGED 2007/12/12 13:13:34 aw 1.6.6.1: #i39532# clipping changes --- basegfx/source/range/b2dmultirange.cxx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/basegfx/source/range/b2dmultirange.cxx b/basegfx/source/range/b2dmultirange.cxx index ff68c5999484..64c3cf5ab813 100644 --- a/basegfx/source/range/b2dmultirange.cxx +++ b/basegfx/source/range/b2dmultirange.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: b2dmultirange.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -35,17 +35,10 @@ #include #include #include -#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX #include -#endif - -#ifndef BOOST_BIND_HPP_INCLUDED +#include #include -#endif -#ifndef BOOST_MEM_FN_HPP_INCLUDED #include -#endif - #include #include @@ -200,8 +193,9 @@ namespace basegfx // remove redundant intersections. Note: since all added // rectangles are positively oriented, this method cannot // generate any holes. - aRes = ::basegfx::tools::removeAllIntersections(aRes); - aRes = ::basegfx::tools::removeNeutralPolygons(aRes, sal_True); + aRes = basegfx::tools::solveCrossovers(aRes); + aRes = basegfx::tools::stripNeutralPolygons(aRes); + aRes = basegfx::tools::stripDispensablePolygons(aRes, false); return aRes; }