From c6aa4fae82a0ce5647d3aeadca2298a224cbd746 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 18 Apr 2005 08:15:38 +0000 Subject: INTEGRATION: CWS presfixes03 (1.2.18); FILE MERGED 2005/04/14 22:57:09 thb 1.2.18.1: #i47428# After fixing the actual bug, it turned out that _background_ objects vanish, when the characters reach their final position. Reason was the generation of equal rectangles, with only the tiniest roundoff difference between them. And the clipper turned that into one huge 'clip nothing' mess. Fixed by using approximate equal now in b2dmultirange --- basegfx/source/range/b2dmultirange.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'basegfx') diff --git a/basegfx/source/range/b2dmultirange.cxx b/basegfx/source/range/b2dmultirange.cxx index 8da2a7d843d2..6165cdbddfc3 100644 --- a/basegfx/source/range/b2dmultirange.cxx +++ b/basegfx/source/range/b2dmultirange.cxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dmultirange.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-11-26 18:40:04 $ + * last change: $Author: obo $ $Date: 2005-04-18 09:15:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,7 +187,7 @@ namespace basegfx VectorOfRanges::const_iterator aFound( aEnd ); while( aCurrScan != aEnd ) { - if( *aCurrScan == *aCurr || + if( aCurrScan->equal( *aCurr ) || aCurrScan->isInside( *aCurr ) ) { // current probe is equal to aCurr, or -- cgit