1 files changed, 83 insertions, 23 deletions
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index dc16938a3f99..d8255dc7ec10 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -41,38 +41,24 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-class CoordinateData2D
+struct CoordinateData2D : public basegfx::B2DPoint
 {
-    basegfx::B2DPoint                               maPoint;
-
 public:
-    CoordinateData2D()
-    :   maPoint()
-    {}
+    CoordinateData2D() {}
 
     explicit CoordinateData2D(const basegfx::B2DPoint& rData)
-    :   maPoint(rData)
+    :   B2DPoint(rData)
     {}
 
-    const basegfx::B2DPoint& getCoordinate() const
+    CoordinateData2D& operator=(const basegfx::B2DPoint& rData)
     {
-        return maPoint;
-    }
-
-    void setCoordinate(const basegfx::B2DPoint& rValue)
-    {
-        if(rValue != maPoint)
-            maPoint = rValue;
-    }
-
-    bool operator==(const CoordinateData2D& rData ) const
-    {
-        return (maPoint == rData.getCoordinate());
+        B2DPoint::operator=(rData);
+        return *this;
     }
 
     void transform(const basegfx::B2DHomMatrix& rMatrix)
     {
-        maPoint *= rMatrix;
+        *this *= rMatrix;
     }
 };
 
@@ -112,12 +98,12 @@ public:
 
     const basegfx::B2DPoint& getCoordinate(sal_uInt32 nIndex) const
     {
-        return maVector[nIndex].getCoordinate();
+        return maVector[nIndex];
     }
 
     void setCoordinate(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue)
     {
-        maVector[nIndex].setCoordinate(rValue);
+        maVector[nIndex] = rValue;
     }
 
     void reserve(sal_uInt32 nCount)
@@ -228,6 +214,38 @@ public:
             aStart->transform(rMatrix);
         }
     }
+
+    const basegfx::B2DPoint* begin() const
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return &maVector.front();
+    }
+
+    const basegfx::B2DPoint* end() const
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return (&maVector.back())+1;
+    }
+
+    basegfx::B2DPoint* begin()
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return &maVector.front();
+    }
+
+    basegfx::B2DPoint* end()
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return (&maVector.back())+1;
+    }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1149,6 +1167,28 @@ public:
             maPoints.transform(rMatrix);
         }
     }
+
+    const basegfx::B2DPoint* begin() const
+    {
+        return maPoints.begin();
+    }
+
+    const basegfx::B2DPoint* end() const
+    {
+        return maPoints.end();
+    }
+
+    basegfx::B2DPoint* begin()
+    {
+       mpBufferedData.reset();
+       return maPoints.begin();
+    }
+
+    basegfx::B2DPoint* end()
+    {
+        mpBufferedData.reset();
+        return maPoints.end();
+    }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1586,6 +1626,26 @@ namespace basegfx
             mpPolygon->transform(rMatrix);
         }
     }
+
+    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
 
 //////////////////////////////////////////////////////////////////////////////