diff options
| author | Armin Le Grand <alg@apache.org> | 2013-08-13 15:10:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-14 11:32:19 +0100 |
| commit | b5c9668d34acdbce500609725760d6578debb95a (patch) | |
| tree | 0e61d3bb269c40fb010b86684637a9be9cb13c1b /include/basegfx/tuple | |
| parent | b74a2e6ee80e30ed42ef99e24f85eb1d2df346ca (diff) | |
Resolves: #i122149# Corrected stuff around polygon-based clip regions
do not use them where not needed
(cherry picked from commit 4ccb1eb7d58005ab3b501b7c6ff128fadbcd5066)
Conflicts:
basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
basegfx/inc/basegfx/tuple/b2dtuple.hxx
basegfx/inc/basegfx/tuple/b3dtuple.hxx
sc/source/ui/inc/output.hxx
sc/source/ui/view/gridwin.cxx
sc/source/ui/view/output.cxx
vcl/win/source/gdi/salgdi.cxx
Change-Id: Ie265814a51180bffe3c821a3f2148cb3bb54ecad
Diffstat (limited to 'include/basegfx/tuple')
| -rw-r--r-- | include/basegfx/tuple/b2dtuple.hxx | 4 | ||||
| -rw-r--r-- | include/basegfx/tuple/b3dtuple.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx index ac2b78f76447..f21124b5ca43 100644 --- a/include/basegfx/tuple/b2dtuple.hxx +++ b/include/basegfx/tuple/b2dtuple.hxx @@ -215,12 +215,12 @@ namespace basegfx bool operator==( const B2DTuple& rTup ) const { - return equal(rTup); + return mfX == rTup.mfX && mfY == rTup.mfY; } bool operator!=( const B2DTuple& rTup ) const { - return !equal(rTup); + return mfX != rTup.mfX || mfY != rTup.mfY; } B2DTuple& operator=( const B2DTuple& rTup ) diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx index 9d8d080db807..d974f86abe28 100644 --- a/include/basegfx/tuple/b3dtuple.hxx +++ b/include/basegfx/tuple/b3dtuple.hxx @@ -240,12 +240,12 @@ namespace basegfx bool operator==( const B3DTuple& rTup ) const { - return equal(rTup); + return mfX == rTup.mfX && mfY == rTup.mfY && mfZ == rTup.mfZ; } bool operator!=( const B3DTuple& rTup ) const { - return !equal(rTup); + return mfX != rTup.mfX || mfY != rTup.mfY || mfZ != rTup.mfZ; } B3DTuple& operator=( const B3DTuple& rTup ) |