diff options
Diffstat (limited to 'basegfx/source/polygon/b3dpolypolygontools.cxx')
| -rw-r--r-- | basegfx/source/polygon/b3dpolypolygontools.cxx | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index 62ddd3ae771f..856fc40dff7e 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -37,12 +37,10 @@ namespace basegfx::utils B3DRange getRange(const B3DPolyPolygon& rCandidate) { B3DRange aRetval; - const sal_uInt32 nPolygonCount(rCandidate.count()); - for(sal_uInt32 a(0); a < nPolygonCount; a++) + for(const auto& rPolygon : rCandidate ) { - const B3DPolygon& aCandidate = rCandidate.getB3DPolygon(a); - aRetval.expand(getRange(aCandidate)); + aRetval.expand(getRange(rPolygon)); } return aRetval; @@ -389,9 +387,9 @@ namespace basegfx::utils { B3DPolyPolygon aRetval; - for(sal_uInt32 a(0); a < rCandidate.count(); a++) + for( const auto& rB3DPolygon : rCandidate) { - aRetval.append(applyDefaultNormalsSphere(rCandidate.getB3DPolygon(a), rCenter)); + aRetval.append(applyDefaultNormalsSphere(rB3DPolygon, rCenter)); } return aRetval; @@ -401,9 +399,9 @@ namespace basegfx::utils { B3DPolyPolygon aRetval; - for(sal_uInt32 a(0); a < rCandidate.count(); a++) + for( const auto& rB3DPolygon : rCandidate ) { - aRetval.append(invertNormals(rCandidate.getB3DPolygon(a))); + aRetval.append(invertNormals(rB3DPolygon)); } return aRetval; @@ -413,9 +411,9 @@ namespace basegfx::utils { B3DPolyPolygon aRetval; - for(sal_uInt32 a(0); a < rCandidate.count(); a++) + for( const auto& rB3DPolygon : rCandidate) { - aRetval.append(applyDefaultTextureCoordinatesParallel(rCandidate.getB3DPolygon(a), rRange, bChangeX, bChangeY)); + aRetval.append(applyDefaultTextureCoordinatesParallel(rB3DPolygon, rRange, bChangeX, bChangeY)); } return aRetval; @@ -425,9 +423,9 @@ namespace basegfx::utils { B3DPolyPolygon aRetval; - for(sal_uInt32 a(0); a < rCandidate.count(); a++) + for( const auto& rB3DPolygon : rCandidate ) { - aRetval.append(applyDefaultTextureCoordinatesSphere(rCandidate.getB3DPolygon(a), rCenter, bChangeX, bChangeY)); + aRetval.append(applyDefaultTextureCoordinatesSphere(rB3DPolygon, rCenter, bChangeX, bChangeY)); } return aRetval; @@ -445,10 +443,9 @@ namespace basegfx::utils { sal_Int32 nInsideCount(0); - for(sal_uInt32 a(0); a < nPolygonCount; a++) + for(const auto& rPolygon : rCandidate ) { - const B3DPolygon& aPolygon(rCandidate.getB3DPolygon(a)); - const bool bInside(isInside(aPolygon, rPoint, false/*bWithBorder*/)); + const bool bInside(isInside(rPolygon, rPoint, false/*bWithBorder*/)); if(bInside) { @@ -475,32 +472,25 @@ namespace basegfx::utils "UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have the same " "length (!)" ); - const css::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray(); - const css::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray(); - const css::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray(); - for(sal_Int32 a(0); a < nOuterSequenceCount; a++) { basegfx::B3DPolygon aNewPolygon; - const sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength()); - assert(nInnerSequenceCount == pInnerSequenceY->getLength() - && nInnerSequenceCount == pInnerSequenceZ->getLength() + + auto& rInnerSequenceX = rPolyPolygonShape3DSource.SequenceX[a]; + auto& rInnerSequenceY = rPolyPolygonShape3DSource.SequenceY[a]; + auto& rInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ[a]; + + const sal_Int32 nInnerSequenceCount(rInnerSequenceX.getLength()); + assert(nInnerSequenceCount == rInnerSequenceY.getLength() + && nInnerSequenceCount == rInnerSequenceZ.getLength() && "UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have " "the same length (!)"); - const double* pArrayX = pInnerSequenceX->getConstArray(); - const double* pArrayY = pInnerSequenceY->getConstArray(); - const double* pArrayZ = pInnerSequenceZ->getConstArray(); - for(sal_Int32 b(0); b < nInnerSequenceCount; b++) { - aNewPolygon.append(basegfx::B3DPoint(*pArrayX++,*pArrayY++,*pArrayZ++)); + aNewPolygon.append(basegfx::B3DPoint(rInnerSequenceX[b], rInnerSequenceY[b], rInnerSequenceZ[b])); } - pInnerSequenceX++; - pInnerSequenceY++; - pInnerSequenceZ++; - // #i101520# correction is needed for imported polygons of old format, // see callers basegfx::utils::checkClosed(aNewPolygon); |