INTEGRATION: CWS presfixes02 (1.4.32); FILE MERGED

2005/03/15 15:33:12 mbu 1.4.32.1: added polypolygon triangulation

1 files changed, 6 insertions, 6 deletions

diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 9c9ea42b9921..0d53f42fbc29 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3dpolygon.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hjs $ $Date: 2004-06-25 17:18:08 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 07:44:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -571,7 +571,7 @@ namespace basegfx
             }
             else
             {
-                OSL_ENSURE(nIndex2 + nCount > rPoly.mpPolygon->count(), "B3DPolygon Insert outside range (!)");
+                OSL_ENSURE(nIndex2 + nCount <= rPoly.mpPolygon->count(), "B3DPolygon Insert outside range (!)");
                 ImplB3DPolygon aTempPoly(*rPoly.mpPolygon, nIndex2, nCount);
                 mpPolygon->insert(nIndex, aTempPoly);
             }
@@ -595,7 +595,7 @@ namespace basegfx
             }
             else
             {
-                OSL_ENSURE(nIndex + nCount > rPoly.mpPolygon->count(), "B3DPolygon Append outside range (!)");
+                OSL_ENSURE(nIndex + nCount <= rPoly.mpPolygon->count(), "B3DPolygon Append outside range (!)");
                 ImplB3DPolygon aTempPoly(*rPoly.mpPolygon, nIndex, nCount);
                 mpPolygon->insert(mpPolygon->count(), aTempPoly);
             }
@@ -653,12 +653,12 @@ namespace basegfx
 
     bool B3DPolygon::hasDoublePoints() const
     {
-        return mpPolygon->hasDoublePoints();
+        return (mpPolygon->count() > 1L && mpPolygon->hasDoublePoints());
     }
 
     void B3DPolygon::removeDoublePoints()
     {
-        if(mpPolygon->count() > 1)
+        if(hasDoublePoints())
         {
             implForceUniqueCopy();
             mpPolygon->removeDoublePointsAtBeginEnd();