diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:44:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:44:23 +0000 |
| commit | 8135c666aab3d83da58b2de26de682fc176e5ba0 (patch) | |
| tree | 01b43025424e6fc7ff8bbb1858c62347a67e504d /basegfx/source/polygon/b2dpolypolygoncutter.cxx | |
| parent | 957cbba44bdd4eb934381a0c4289d81552d3699a (diff) | |
INTEGRATION: CWS warnings01 (1.8.30); FILE MERGED
2006/04/07 20:58:19 sb 1.8.30.5: RESYNC: (1.10-1.11); FILE MERGED
2005/11/08 17:55:52 pl 1.8.30.4: #i53898# removed warnings
2005/11/07 19:36:16 pl 1.8.30.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/22 23:47:37 sb 1.8.30.2: RESYNC: (1.8-1.9); FILE MERGED
2005/09/01 19:39:30 thb 1.8.30.1: #i53898# Removed dead code; added missing case statement for enum switch (plus an asserted default); corrected assignment of ptr type to integer type
Diffstat (limited to 'basegfx/source/polygon/b2dpolypolygoncutter.cxx')
| -rw-r--r-- | basegfx/source/polygon/b2dpolypolygoncutter.cxx | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index fbe7ee9e315e..780904f67daf 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: b2dpolypolygoncutter.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2006-01-26 17:17:33 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:44:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -300,6 +300,11 @@ namespace basegfx mbChanged = true; break; } + case COMMON_IS_PARALLEL: + case COMMON_IS_PARALLEL_OPPOSITE: + case COMMON_IS_TOUCH: + case COMMON_IS_DEADEND: + break; } } @@ -451,11 +456,11 @@ namespace basegfx // bitfield unsigned mbChanged : 1; - void impHandleLeaving(impPolyPolygonPointNode& rCandA, impPolyPolygonPointNode& rCandB, bool bOpposite, bool bSideOfLeave) + void impHandleLeaving(impPolyPolygonPointNode& rCandidateA, impPolyPolygonPointNode& rCandidateB, bool bOpposite, bool bSideOfLeave) { // go back on A and look for node entering B - sal_uInt32 nIndexA(rCandA.mnSelf); - sal_uInt32 nIndexB(rCandB.mnSelf); + sal_uInt32 nIndexA(rCandidateA.mnSelf); + sal_uInt32 nIndexB(rCandidateB.mnSelf); bool bOnCommonEdge(true); // go along common edge as long as we are on common edge, backward on @@ -511,12 +516,12 @@ namespace basegfx // switch at enter and leave, make the common edge(s) an own neutral // polygon impSwitchNext(rEnterCandA, rEnterCandB, maPointNodes); - impSwitchNext(rCandA, rCandB, maPointNodes); + impSwitchNext(rCandidateA, rCandidateB, maPointNodes); } else { // switch at leave - impSwitchNext(rCandA, rCandB, maPointNodes); + impSwitchNext(rCandidateA, rCandidateB, maPointNodes); } // set changed flag @@ -595,6 +600,13 @@ namespace basegfx mbChanged = true; break; } + case COMMON_IS_PARALLEL: + case COMMON_IS_PARALLEL_OPPOSITE: + case COMMON_IS_ENTER: + case COMMON_IS_ENTER_OPPOSITE: + case COMMON_IS_TOUCH: + case COMMON_IS_DEADEND: + break; } } @@ -854,7 +866,6 @@ namespace basegfx impStripHelper& rHelperB = aHelpers[b]; const bool bAInB(rHelperB.maRange.isInside(rHelperA.maRange) && tools::isInside(aCandB, aCandA, true)); const bool bBInA(rHelperA.maRange.isInside(rHelperB.maRange) && tools::isInside(aCandA, aCandB, true)); - bool bForceDelete(false); if(bAInB && bBInA) { |