diff options
Diffstat (limited to 'basegfx/source/tools/b2dclipstate.cxx')
| -rw-r--r-- | basegfx/source/tools/b2dclipstate.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index 46cf9bbe724f..4f1d68b0f699 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ namespace tools bool isCleared() const { return !maClipPoly.count() - && !maPendingPolygons.count() + && !maPendingPolygons.count() && !maPendingRanges.count(); } @@ -103,7 +103,7 @@ namespace tools bool isNull() const { - return !maPendingPolygons.count() + return !maPendingPolygons.count() && !maPendingRanges.count() && isNullClipPoly(); } @@ -119,9 +119,9 @@ namespace tools bool operator==(const ImplB2DClipState& rRHS) const { - return maPendingPolygons == rRHS.maPendingPolygons + return maPendingPolygons == rRHS.maPendingPolygons && maPendingRanges == rRHS.maPendingRanges - && maClipPoly == rRHS.maClipPoly + && maClipPoly == rRHS.maClipPoly && mePendingOps == rRHS.mePendingOps; } @@ -208,10 +208,10 @@ namespace tools { if( isCleared() ) return; - + addClipState(rOther, UNION); } - + void intersectRange(const B2DRange& rRange) { if( isNull() ) @@ -240,10 +240,10 @@ namespace tools { if( isNull() ) return; - + addClipState(rOther, INTERSECT); } - + void subtractRange(const B2DRange& rRange ) { if( isNull() ) @@ -267,7 +267,7 @@ namespace tools addPolyPolygon(rPolyPoly,SUBTRACT); } - + void subtractClipState(const ImplB2DClipState& rOther) { if( isNull() ) @@ -275,7 +275,7 @@ namespace tools addClipState(rOther, SUBTRACT); } - + void xorRange(const B2DRange& rRange) { addRange(rRange,XOR); @@ -295,7 +295,7 @@ namespace tools { addClipState(rOther, XOR); } - + B2DPolyPolygon getClipPoly() const { commitPendingRanges(); @@ -369,7 +369,7 @@ namespace tools maPendingPolygons = solveCrossovers(maPendingPolygons); maPendingPolygons = stripNeutralPolygons(maPendingPolygons); maPendingPolygons = stripDispensablePolygons(maPendingPolygons, false); - + if( bIsCleared ) { // not representable, strictly speaking, @@ -403,7 +403,7 @@ namespace tools return; // use the specialized range clipper for the win - B2DPolyPolygon aCollectedRanges; + B2DPolyPolygon aCollectedRanges; const bool bIsEmpty=isNullClipPoly(); const bool bIsCleared=!maClipPoly.count(); switch(mePendingOps) @@ -471,7 +471,7 @@ namespace tools aCollectedRanges = maPendingRanges.solveCrossovers(); aCollectedRanges = stripNeutralPolygons(aCollectedRanges); aCollectedRanges = stripDispensablePolygons(aCollectedRanges, false); - + if( bIsCleared ) { // not representable, strictly speaking, @@ -498,7 +498,7 @@ namespace tools maPendingRanges.clear(); mePendingOps = UNION; } - + mutable B2DPolyPolygon maPendingPolygons; mutable B2DPolyRange maPendingRanges; mutable B2DPolyPolygon maClipPoly; @@ -538,7 +538,7 @@ namespace tools { mpImpl.make_unique(); } - + void B2DClipState::makeNull() { mpImpl->makeNull(); @@ -631,7 +631,7 @@ namespace tools { mpImpl->subtractClipState(*rState.mpImpl); } - + void B2DClipState::xorRange(const B2DRange& rRange) { mpImpl->xorRange(rRange); |