diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:07:55 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:07:55 +0000 |
commit | d958565f2fa35caf67a0dd4ec1386130c237ad9f (patch) | |
tree | 1ea3dbfac6aecf299826e1c5c01a690d50a76690 /basegfx/source | |
parent | 81f6a5d151e9d1677f5e78f8abb9421491a5603b (diff) |
INTEGRATION: CWS aw055 (1.9.48); FILE MERGED
2008/02/29 04:32:01 aw 1.9.48.2: removed op equal at polygons, added to tooling. Done for 2D and 3D
2008/02/28 08:04:56 aw 1.9.48.1: finetuning for SVG im/export
Diffstat (limited to 'basegfx/source')
-rw-r--r-- | basegfx/source/polygon/b3dpolypolygon.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx index f5490f0381dd..74fb8f61f077 100644 --- a/basegfx/source/polygon/b3dpolypolygon.cxx +++ b/basegfx/source/polygon/b3dpolypolygon.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: b3dpolypolygon.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -58,16 +58,12 @@ public: { } - bool isEqual(const ImplB3DPolyPolygon& rPolygonList) const + bool operator==(const ImplB3DPolyPolygon& rPolygonList) const { // same polygon count? if(maPolygons.size() != rPolygonList.maPolygons.size()) return false; - // if zero polygons the polys are equal - if(!maPolygons.size()) - return true; - // compare polygon content if(maPolygons != rPolygonList.maPolygons) return false; @@ -214,7 +210,7 @@ namespace basegfx if(mpPolyPolygon.same_object(rPolyPolygon.mpPolyPolygon)) return true; - return mpPolyPolygon->isEqual(*(rPolyPolygon.mpPolyPolygon)); + return ((*mpPolyPolygon) == (*rPolyPolygon.mpPolyPolygon)); } bool B3DPolyPolygon::operator!=(const B3DPolyPolygon& rPolyPolygon) const |