summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive3d
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-16 14:45:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-17 08:14:31 +0200
commitff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch)
tree272dfa9af5ead31b61c1be34afcaf4402ff4ad77 /drawinglayer/source/primitive3d
parent224b770fa77fe12ad5dc543ce020aca316b6558d (diff)
remove UL/L suffixes from integer constants in initialiser/call expressions
Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300 Reviewed-on: https://gerrit.libreoffice.org/41214 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer/source/primitive3d')
-rw-r--r--drawinglayer/source/primitive3d/baseprimitive3d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/polygonprimitive3d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx10
-rw-r--r--drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx6
-rw-r--r--drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx28
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx2
9 files changed, 31 insertions, 31 deletions
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 7180e73e992d..02ba16fda68c 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -141,7 +141,7 @@ namespace drawinglayer
{
const size_t nCount(size());
- for(size_t a(0L); a < nCount; a++)
+ for(size_t a(0); a < nCount; a++)
{
aRetval.expand(getB3DRangeFromPrimitive3DReference((*this)[a], aViewInformation));
}
@@ -202,7 +202,7 @@ namespace drawinglayer
return false;
}
- for(size_t a(0L); a < nCount; a++)
+ for(size_t a(0); a < nCount; a++)
{
if(!arePrimitive3DReferencesEqual((*this)[a], rB[a]))
{
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 3f6f819bce00..20de70b7610a 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -98,7 +98,7 @@ namespace drawinglayer
const basegfx::B2DLineJoin aLineJoin(getLineAttribute().getLineJoin());
const css::drawing::LineCap aLineCap(getLineAttribute().getLineCap());
- for(sal_uInt32 a(0L); a < aHairLinePolyPolygon.count(); a++)
+ for(sal_uInt32 a(0); a < aHairLinePolyPolygon.count(); a++)
{
// create tube primitives
const Primitive3DReference xRef(
@@ -114,7 +114,7 @@ namespace drawinglayer
else
{
// create hair line data for all sub polygons
- for(sal_uInt32 a(0L); a < aHairLinePolyPolygon.count(); a++)
+ for(sal_uInt32 a(0); a < aHairLinePolyPolygon.count(); a++)
{
const basegfx::B3DPolygon aCandidate = aHairLinePolyPolygon.getB3DPolygon(a);
const Primitive3DReference xRef(new PolygonHairlinePrimitive3D(aCandidate, getLineAttribute().getColor()));
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index e49153ccd1b2..5551694e41db 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -44,7 +44,7 @@ namespace drawinglayer
::osl::Mutex m_aMutex;
public:
TubeBuffer()
- : m_nLineTubeSegments(0L)
+ : m_nLineTubeSegments(0)
{
}
@@ -316,7 +316,7 @@ namespace drawinglayer
// create half-sphere
const basegfx::B3DPolyPolygon aSphere(basegfx::tools::createUnitSphereFillPolyPolygon(nHorSeg, nVerSeg, true, F_PI2, -F_PI2, 0.0, fAngle));
- for(sal_uInt32 a(0L); a < aSphere.count(); a++)
+ for(sal_uInt32 a(0); a < aSphere.count(); a++)
{
const basegfx::B3DPolygon aPartPolygon(aSphere.getB3DPolygon(a));
const basegfx::B3DPolyPolygon aPartPolyPolygon(aPartPolygon);
@@ -360,7 +360,7 @@ namespace drawinglayer
aNewPolygon.setClosed(true);
aMiterPolygon.setClosed(true);
- for(sal_uInt32 a(0L); a < nVerSeg; a++)
+ for(sal_uInt32 a(0); a < nVerSeg; a++)
{
const bool bFirst(0L == a);
const bool bLast(a + 1L == nVerSeg);
@@ -459,7 +459,7 @@ namespace drawinglayer
}
// set normals
- for(sal_uInt32 b(0L); b < aNewPolygon.count(); b++)
+ for(sal_uInt32 b(0); b < aNewPolygon.count(); b++)
{
aNewPolygon.setNormal(b, basegfx::B3DVector(aNewPolygon.getB3DPoint(b)));
}
@@ -475,7 +475,7 @@ namespace drawinglayer
if(bMiter && aMiterPolygon.count())
{
// set normals
- for(sal_uInt32 c(0L); c < aMiterPolygon.count(); c++)
+ for(sal_uInt32 c(0); c < aMiterPolygon.count(); c++)
{
aMiterPolygon.setNormal(c, basegfx::B3DVector(aMiterPolygon.getB3DPoint(c)));
}
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 9c52e5e57bbe..2ad004a69676 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -91,13 +91,13 @@ namespace drawinglayer
if(bObjectSpecificX || bObjectSpecificY)
{
// object-specific
- for(sal_uInt32 a(0L); a < aFill.count(); a++)
+ for(sal_uInt32 a(0); a < aFill.count(); a++)
{
basegfx::B3DPolygon aTmpPoly(aFill.getB3DPolygon(a));
if(aTmpPoly.count() >= 4L)
{
- for(sal_uInt32 b(0L); b < 4L; b++)
+ for(sal_uInt32 b(0); b < 4L; b++)
{
basegfx::B2DPoint aPoint(aTmpPoly.getTextureCoordinate(b));
@@ -128,7 +128,7 @@ namespace drawinglayer
// build vector of PolyPolygons
std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
- for(sal_uInt32 a(0L); a < aFill.count(); a++)
+ for(sal_uInt32 a(0); a < aFill.count(); a++)
{
a3DPolyPolygonVector.push_back(basegfx::B3DPolyPolygon(aFill.getB3DPolygon(a)));
}
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index bc1465388e7f..8f8f80303e9d 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -146,7 +146,7 @@ namespace drawinglayer
// create primitives
Primitive3DContainer aRetval(aScaledPolyPolygon.count());
- for(sal_uInt32 a(0L); a < aScaledPolyPolygon.count(); a++)
+ for(sal_uInt32 a(0); a < aScaledPolyPolygon.count(); a++)
{
const Primitive3DReference xRef(new PolygonStrokePrimitive3D(aScaledPolyPolygon.getB3DPolygon(a), aLineAttribute, aStrokeAttribute));
aRetval[a] = xRef;
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index d79d5ffb0634..f3a6d3dc9a74 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -113,7 +113,7 @@ namespace
OSL_ENSURE(rPolA.count() == rPolB.count(), "impAddInBetweenFill: unequally sized polygons (!)");
const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
- for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+ for(sal_uInt32 a(0); a < nPolygonCount; a++)
{
const basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
const basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
@@ -135,7 +135,7 @@ namespace
fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB;
}
- for(sal_uInt32 b(0L); b < nEdgeCount; b++)
+ for(sal_uInt32 b(0); b < nEdgeCount; b++)
{
const sal_uInt32 nIndexA(b);
const sal_uInt32 nIndexB((b + 1L) % nPointCount);
@@ -189,11 +189,11 @@ namespace
basegfx::B3DPolyPolygon& rCandidate,
const basegfx::B3DVector& rNormal)
{
- for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+ for(sal_uInt32 a(0); a < rCandidate.count(); a++)
{
basegfx::B3DPolygon aSub(rCandidate.getB3DPolygon(a));
- for(sal_uInt32 b(0L); b < aSub.count(); b++)
+ for(sal_uInt32 b(0); b < aSub.count(); b++)
{
aSub.setNormal(b, rNormal);
}
@@ -210,7 +210,7 @@ namespace
OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
- for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+ for(sal_uInt32 a(0); a < nPolygonCount; a++)
{
basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
@@ -220,10 +220,10 @@ namespace
if(nPointCount)
{
basegfx::B3DPoint aPrevA(aSubA.getB3DPoint(nPointCount - 1L));
- basegfx::B3DPoint aCurrA(aSubA.getB3DPoint(0L));
+ basegfx::B3DPoint aCurrA(aSubA.getB3DPoint(0));
const bool bClosed(aSubA.isClosed());
- for(sal_uInt32 b(0L); b < nPointCount; b++)
+ for(sal_uInt32 b(0); b < nPointCount; b++)
{
const sal_uInt32 nIndNext((b + 1L) % nPointCount);
const basegfx::B3DPoint aNextA(aSubA.getB3DPoint(nIndNext));
@@ -294,14 +294,14 @@ namespace
OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
const sal_uInt32 nPolygonCount(std::min(rPolA.count(), rPolB.count()));
- for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+ for(sal_uInt32 a(0); a < nPolygonCount; a++)
{
basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
const basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
OSL_ENSURE(aSubA.count() == aSubB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
const sal_uInt32 nPointCount(std::min(aSubA.count(), aSubB.count()));
- for(sal_uInt32 b(0L); b < nPointCount; b++)
+ for(sal_uInt32 b(0); b < nPointCount; b++)
{
const basegfx::B3DVector aVA(aSubA.getNormal(b) * fWeightA);
const basegfx::B3DVector aVB(aSubB.getNormal(b) * fWeightB);
@@ -427,7 +427,7 @@ namespace drawinglayer
// create segments (a + 1 .. nSteps)
const double fStepSize(1.0 / (double)nSteps);
- for(sal_uInt32 a(0L); a < nSteps; a++)
+ for(sal_uInt32 a(0); a < nSteps; a++)
{
const double fStep((double)(a + 1L) * fStepSize);
basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::tools::interpolate(aFront, aBack, fStep) : aFront);
@@ -563,7 +563,7 @@ namespace drawinglayer
basegfx::B3DPolyPolygon aRetval;
const sal_uInt32 nNumSlices(rSliceVector.size());
- for(sal_uInt32 a(0L); a < nNumSlices; a++)
+ for(sal_uInt32 a(0); a < nNumSlices; a++)
{
aRetval.append(rSliceVector[a].getB3DPolyPolygon());
}
@@ -672,7 +672,7 @@ namespace drawinglayer
if(aFront.count())
{
- aNormal = -aFront.getB3DPolygon(0L).getNormal();
+ aNormal = -aFront.getB3DPolygon(0).getNormal();
}
impSetNormal(aFront, aNormal);
@@ -766,7 +766,7 @@ namespace drawinglayer
if(bCreateNormals)
{
- const basegfx::B3DVector aNormal(aBack.count() ? aBack.getB3DPolygon(0L).getNormal() : basegfx::B3DVector(0.0, 0.0, 1.0));
+ const basegfx::B3DVector aNormal(aBack.count() ? aBack.getB3DPolygon(0).getNormal() : basegfx::B3DVector(0.0, 0.0, 1.0));
impSetNormal(aBack, aNormal);
if(bHasSlant)
@@ -874,7 +874,7 @@ namespace drawinglayer
if(aFront.count())
{
- aNormal = -aFront.getB3DPolygon(0L).getNormal();
+ aNormal = -aFront.getB3DPolygon(0).getNormal();
}
impSetNormal(aFront, aNormal);
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 3f901f61069a..06a6eb3f2050 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -57,7 +57,7 @@ namespace drawinglayer
if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY))
{
- const basegfx::B2DPolygon aFirstPolygon(maCorrectedPolyPolygon.getB2DPolygon(0L));
+ const basegfx::B2DPolygon aFirstPolygon(maCorrectedPolyPolygon.getB2DPolygon(0));
const double fFrontLength(basegfx::tools::getLength(aFirstPolygon));
const double fFrontArea(basegfx::tools::getArea(aFirstPolygon));
const double fSqrtFrontArea(sqrt(fFrontArea));
@@ -428,7 +428,7 @@ namespace drawinglayer
}
// no close front/back when polygon is not closed
- if(getPolyPolygon().count() && !getPolyPolygon().getB2DPolygon(0L).isClosed())
+ if(getPolyPolygon().count() && !getPolyPolygon().getB2DPolygon(0).isClosed())
{
mbCloseFront = mbCloseBack = false;
}
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 4f38141846ac..a84aa999dcad 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -288,7 +288,7 @@ namespace drawinglayer
}
// no close front/back when polygon is not closed
- if(getPolyPolygon().count() && !getPolyPolygon().getB2DPolygon(0L).isClosed())
+ if(getPolyPolygon().count() && !getPolyPolygon().getB2DPolygon(0).isClosed())
{
mbCloseFront = mbCloseBack = false;
}
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index 75b6127405f3..2b3cbdd4ad0a 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -117,7 +117,7 @@ namespace drawinglayer
// build vector of PolyPolygons
std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
- for(sal_uInt32 a(0L); a < aFill.count(); a++)
+ for(sal_uInt32 a(0); a < aFill.count(); a++)
{
a3DPolyPolygonVector.push_back(basegfx::B3DPolyPolygon(aFill.getB3DPolygon(a)));
}