diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:06:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:06:13 +0000 |
| commit | 04bca394babfaa3ddc5411d7812611d394c1b9b3 (patch) | |
| tree | a533e7977146898b06c8239ed9adbab4c2d79e3e /basegfx/source | |
| parent | 5adc6119a901a11243356e3d586264d081f8f6f3 (diff) | |
INTEGRATION: CWS aw055 (1.19.28); FILE MERGED
2008/02/29 04:32:01 aw 1.19.28.2: removed op equal at polygons, added to tooling. Done for 2D and 3D
2008/02/28 08:04:56 aw 1.19.28.1: finetuning for SVG im/export
Diffstat (limited to 'basegfx/source')
| -rw-r--r-- | basegfx/source/polygon/b2dpolygon.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index af6e2730587c..ac4dfddaede9 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: b2dpolygon.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -107,7 +107,7 @@ public: return maVector.size(); } - bool isEqual(const CoordinateDataArray2D& rCandidate) const + bool operator==(const CoordinateDataArray2D& rCandidate) const { return (maVector == rCandidate.maVector); } @@ -252,7 +252,7 @@ public: maNextVector = rValue; } - bool operator==(const ControlVectorPair2D& rData ) const + bool operator==(const ControlVectorPair2D& rData) const { return (maPrevVector == rData.getPrevVector() && maNextVector == rData.getNextVector()); } @@ -305,7 +305,7 @@ public: return maVector.size(); } - bool isEqual(const ControlVectorArray2D& rCandidate) const + bool operator==(const ControlVectorArray2D& rCandidate) const { return (maVector == rCandidate.maVector); } @@ -558,11 +558,11 @@ public: } } - bool isEqual(const ImplB2DPolygon& rCandidate) const + bool operator==(const ImplB2DPolygon& rCandidate) const { if(mbIsClosed == rCandidate.mbIsClosed) { - if(maPoints.isEqual(rCandidate.maPoints)) + if(maPoints == rCandidate.maPoints) { bool bControlVectorsAreEqual(true); @@ -570,7 +570,7 @@ public: { if(rCandidate.mpControlVector) { - bControlVectorsAreEqual = mpControlVector->isEqual(*rCandidate.mpControlVector); + bControlVectorsAreEqual = ((*mpControlVector) == (*rCandidate.mpControlVector)); } else { @@ -1008,7 +1008,7 @@ namespace basegfx if(mpPolygon.same_object(rPolygon.mpPolygon)) return true; - return mpPolygon->isEqual(*(rPolygon.mpPolygon)); + return ((*mpPolygon) == (*rPolygon.mpPolygon)); } bool B2DPolygon::operator!=(const B2DPolygon& rPolygon) const |