5 files changed, 74 insertions, 45 deletions

diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index 694531ca3a64..da23bb4f1058 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -262,12 +262,6 @@ namespace basegfx
 
         /// apply transformation given in matrix form
         void transform(const basegfx::B2DHomMatrix& rMatrix);
-
-        // point iterators (same iterator validity conditions as for vector)
-        const B2DPoint* begin() const;
-        const B2DPoint* end() const;
-        B2DPoint* begin();
-        B2DPoint* end();
     };
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
index ffcc4f262e81..1964e5f78a4f 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
@@ -121,6 +121,12 @@ namespace basegfx
 
         // apply transformation given in matrix form to the polygon
         void transform(const basegfx::B3DHomMatrix& rMatrix);
+
+        // polygon iterators (same iterator validity conditions as for vector)
+        const B3DPolygon* begin() const;
+        const B3DPolygon* end() const;
+        B3DPolygon* begin();
+        B3DPolygon* end();
     };
 } // end of namespace basegfx
 
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index e9bbb97c1234..3bc0401e271e 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -1628,25 +1628,6 @@ namespace basegfx
         }
     }
 
-    const B2DPoint* B2DPolygon::begin() const
-    {
-        return mpPolygon->begin();
-    }
-
-    const B2DPoint* B2DPolygon::end() const
-    {
-        return mpPolygon->end();
-    }
-
-    B2DPoint* B2DPolygon::begin()
-    {
-        return mpPolygon->begin();
-    }
-
-    B2DPoint* B2DPolygon::end()
-    {
-        return mpPolygon->end();
-    }
 } // end of namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index 3bdd9c30340d..cbd59b6ac362 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -90,21 +90,10 @@ public:
 
     void insert(sal_uInt32 nIndex, const ::basegfx::B3DPolyPolygon& rPolyPolygon)
     {
-        const sal_uInt32 nCount = rPolyPolygon.count();
-
-        if(nCount)
-        {
-            // add nCount polygons from rPolyPolygon
-            maPolygons.reserve(maPolygons.size() + nCount);
-            PolygonVector::iterator aIndex(maPolygons.begin());
-            aIndex += nIndex;
-
-            for(sal_uInt32 a(0L); a < nCount; a++)
-            {
-                maPolygons.insert(aIndex, rPolyPolygon.getB3DPolygon(a));
-                aIndex++;
-            }
-        }
+        // add all polygons from rPolyPolygon
+        PolygonVector::iterator aIndex(maPolygons.begin());
+        aIndex += nIndex;
+        maPolygons.insert(aIndex, rPolyPolygon.begin(), rPolyPolygon.end());
     }
 
     void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
@@ -201,6 +190,38 @@ public:
                        maPolygons.end(),
                        std::mem_fun_ref( &::basegfx::B3DPolygon::makeUnique ));
     }
+
+    const basegfx::B3DPolygon* begin() const
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &maPolygons.front();
+    }
+
+    const basegfx::B3DPolygon* end() const
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return (&maPolygons.back())+1;
+    }
+
+    basegfx::B3DPolygon* begin()
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &maPolygons.front();
+    }
+
+    basegfx::B3DPolygon* end()
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &(maPolygons.back())+1;
+    }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -440,6 +461,26 @@ namespace basegfx
             mpPolyPolygon->transform(rMatrix);
         }
     }
+
+    const B3DPolygon* B3DPolyPolygon::begin() const
+    {
+        return mpPolyPolygon->begin();
+    }
+
+    const B3DPolygon* B3DPolyPolygon::end() const
+    {
+        return mpPolyPolygon->end();
+    }
+
+    B3DPolygon* B3DPolyPolygon::begin()
+    {
+        return mpPolyPolygon->begin();
+    }
+
+    B3DPolygon* B3DPolyPolygon::end()
+    {
+        return mpPolyPolygon->end();
+    }
 } // end of namespace basegfx
 
 // eof
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 05cbb7bc252f..20a17b031fe7 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -206,18 +206,25 @@ public:
                 aTmp.flip();
 
             aTmp=tools::removeNeutralPoints(aTmp);
+            std::vector<B2DPoint> aTmp2(aTmp.count());
+            for(sal_uInt32 j=0; j<aTmp.count(); ++j)
+                aTmp2[j] = aTmp.getB2DPoint(j);
 
-            B2DPoint* pSmallest=0;
-            for(B2DPoint* pCurr=aTmp.begin(); pCurr!=aTmp.end(); ++pCurr)
+            std::vector<B2DPoint>::iterator pSmallest=aTmp2.end();
+            for(std::vector<B2DPoint>::iterator pCurr=aTmp2.begin(); pCurr!=aTmp2.end(); ++pCurr)
             {
-                if( ! pSmallest || compare(*pCurr, *pSmallest) )
+                if( pSmallest == aTmp2.end() || compare(*pCurr, *pSmallest) )
                 {
                     pSmallest=pCurr;
                 }
             }
 
-            if( pSmallest )
-                std::rotate(aTmp.begin(),pSmallest,aTmp.end());
+            if( pSmallest != aTmp2.end() )
+                std::rotate(aTmp2.begin(),pSmallest,aTmp2.end());
+
+            aTmp.clear();
+            for(std::vector<B2DPoint>::iterator pCurr=aTmp2.begin(); pCurr!=aTmp2.end(); ++pCurr)
+                aTmp.append(*pCurr);
 
             aRes.append(aTmp);
         }