Kaydet (Commit) ff1f6a5f authored tarafından Noel Grandin's avatar Noel Grandin

remove UL/L suffixes from integer constants in initialiser/call expressions

Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300
Reviewed-on: https://gerrit.libreoffice.org/41214Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 224b770f
......@@ -662,7 +662,7 @@ void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStre
// Remember position for length
sal_Int32 nObjLenMark = xMarkStream->createMark();
OutStream->writeLong( 0L );
OutStream->writeLong( 0 );
OutStream->writeLong( aIndex.size() );
......
......@@ -270,7 +270,7 @@ void ODbaseTable::readHeader()
void ODbaseTable::fillColumns()
{
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
m_pFileStream->Seek(32L);
m_pFileStream->Seek(32);
if(!m_aColumns.is())
m_aColumns = new OSQLColumns();
......@@ -548,7 +548,7 @@ bool ODbaseTable::ReadMemoHeader()
{
m_pMemoStream->SetEndian(SvStreamEndian::LITTLE);
m_pMemoStream->RefreshBuffer(); // make sure that the header information is actually read again
m_pMemoStream->Seek(0L);
m_pMemoStream->Seek(0);
(*m_pMemoStream).ReadUInt32( m_aMemoHeader.db_next );
switch (m_aHeader.type)
......@@ -556,7 +556,7 @@ bool ODbaseTable::ReadMemoHeader()
case dBaseIIIMemo: // dBase III: fixed block size
case dBaseIVMemo:
// sometimes dBase3 is attached to dBase4 memo
m_pMemoStream->Seek(20L);
m_pMemoStream->Seek(20);
(*m_pMemoStream).ReadUInt16( m_aMemoHeader.db_size );
if (m_aMemoHeader.db_size > 1 && m_aMemoHeader.db_size != 512) // 1 is also for dBase 3
m_aMemoHeader.db_typ = MemodBaseIV;
......@@ -582,7 +582,7 @@ bool ODbaseTable::ReadMemoHeader()
case VisualFoxProAuto:
case FoxProMemo:
m_aMemoHeader.db_typ = MemoFoxPro;
m_pMemoStream->Seek(6L);
m_pMemoStream->Seek(6);
m_pMemoStream->SetEndian(SvStreamEndian::BIG);
(*m_pMemoStream).ReadUInt16( m_aMemoHeader.db_size );
break;
......@@ -1174,7 +1174,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
char aBuffer[21]; // write buffer
memset(aBuffer,0,sizeof(aBuffer));
m_pFileStream->Seek(0L);
m_pFileStream->Seek(0);
(*m_pFileStream).WriteUChar( nDbaseType ); // dBase format
(*m_pFileStream).WriteUChar( aDate.GetYearUnsigned() % 100 ); // current date
......@@ -1342,12 +1342,12 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
(*m_pFileStream).WriteUChar( FIELD_DESCRIPTOR_TERMINATOR ); // end of header
(*m_pFileStream).WriteChar( (char)DBF_EOL );
m_pFileStream->Seek(10L);
m_pFileStream->Seek(10);
(*m_pFileStream).WriteUInt16( nRecLength ); // set record length afterwards
if (bCreateMemo)
{
m_pFileStream->Seek(0L);
m_pFileStream->Seek(0);
if (nDbaseType == VisualFoxPro)
(*m_pFileStream).WriteUChar( FoxProMemo );
else
......@@ -1379,7 +1379,7 @@ bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
m_pMemoStream->SetStreamSize(512);
m_pMemoStream->Seek(0L);
m_pMemoStream->Seek(0);
(*m_pMemoStream).WriteUInt32( 1 ); // pointer to the first free block
m_pMemoStream->Flush();
......@@ -1493,7 +1493,7 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, const Reference<XIndexAccess>
{
(*m_pFileStream).WriteChar( (char)DBF_EOL ); // write EOL
// raise number of datasets in the header:
m_pFileStream->Seek( 4L );
m_pFileStream->Seek( 4 );
(*m_pFileStream).WriteUInt32( m_aHeader.nbRecords + 1 );
m_pFileStream->Flush();
......@@ -2004,7 +2004,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr
{
char sHeader[4];
m_pMemoStream->Seek(rBlockNr * m_aMemoHeader.db_size);
m_pMemoStream->SeekRel(4L);
m_pMemoStream->SeekRel(4);
m_pMemoStream->ReadBytes(sHeader, 4);
std::size_t nOldSize;
......@@ -2097,7 +2097,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr
m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
// Write the new block number
m_pMemoStream->Seek(0L);
m_pMemoStream->Seek(0);
(*m_pMemoStream).WriteUInt32( m_aMemoHeader.db_next );
m_pMemoStream->Flush();
}
......
......@@ -162,7 +162,7 @@ namespace drawinglayer
AnimationEntryList::Entries::size_type AnimationEntryList::impGetIndexAtTime(double fTime, double &rfAddedTime) const
{
Entries::size_type nIndex(0L);
Entries::size_type nIndex(0);
while(nIndex < maEntries.size() && basegfx::fTools::lessOrEqual(rfAddedTime + maEntries[nIndex]->getDuration(), fTime))
{
......
......@@ -145,7 +145,7 @@ namespace drawinglayer
basegfx::B3DVector aEyeNormal(rNormalInEyeCoordinates);
aEyeNormal.normalize();
for(sal_uInt32 a(0L); a < nLightCount; a++)
for(sal_uInt32 a(0); a < nLightCount; a++)
{
const Sdr3DLightAttribute& rLight(mpSdrLightingAttribute->getLightVector()[a]);
const double fCosFac(rLight.getDirection().scalar(aEyeNormal));
......
......@@ -135,7 +135,7 @@ namespace drawinglayer
const sal_uInt32 nCount(rmMatrixStack.size());
maMatrixStack.reserve(nCount);
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
maMatrixStack.push_back(basegfx::tools::B2DHomMatrixBufferedDecompose(rmMatrixStack[a]));
}
......
......@@ -194,7 +194,7 @@ namespace drawinglayer
{
const sal_Int32 nCount(size());
for(sal_Int32 a(0L); a < nCount; a++)
for(sal_Int32 a(0); a < nCount; a++)
{
aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
}
......@@ -255,7 +255,7 @@ namespace drawinglayer
return false;
}
for(size_t a(0L); a < nCount; a++)
for(size_t a(0); a < nCount; a++)
{
if(!arePrimitive2DReferencesEqual((*this)[a], rB[a]))
{
......
......@@ -67,7 +67,7 @@ namespace drawinglayer
double fViewStepX((rViewInformation.getObjectToViewTransformation() * basegfx::B2DVector(fStepX, 0.0)).getLength());
double fViewStepY((rViewInformation.getObjectToViewTransformation() * basegfx::B2DVector(0.0, fStepY)).getLength());
double fSmallStepX(1.0), fViewSmallStepX(1.0), fSmallStepY(1.0), fViewSmallStepY(1.0);
sal_uInt32 nSmallStepsX(0L), nSmallStepsY(0L);
sal_uInt32 nSmallStepsX(0), nSmallStepsY(0);
// setup subdivisions
if(getSubdivisionsX())
......
......@@ -111,7 +111,7 @@ namespace drawinglayer
// clip against visible area
const basegfx::B2DPolyPolygon aResult(basegfx::tools::clipPolygonOnRange(aLine, rViewInformation.getDiscreteViewport(), true, true));
for(sal_uInt32 a(0L); a < aResult.count(); a++)
for(sal_uInt32 a(0); a < aResult.count(); a++)
{
basegfx::B2DPolygon aPart(aResult.getB2DPolygon(a));
aPart.transform(rViewInformation.getInverseObjectToViewTransformation());
......
......@@ -248,7 +248,7 @@ namespace drawinglayer
basegfx::B2DPolyPolygon aAreaPolyPolygon;
const double fMiterMinimumAngle(getLineAttribute().getMiterMinimumAngle());
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
// New version of createAreaGeometry; now creates bezier polygons
aAreaPolyPolygon.append(basegfx::tools::createAreaGeometry(
......@@ -262,7 +262,7 @@ namespace drawinglayer
}
// create primitive
for(sal_uInt32 b(0L); b < aAreaPolyPolygon.count(); b++)
for(sal_uInt32 b(0); b < aAreaPolyPolygon.count(); b++)
{
// put into single polyPolygon primitives to make clear that this is NOT meant
// to be painted as a single tools::PolyPolygon (XORed as fill rule). Alternatively, a
......
......@@ -47,7 +47,7 @@ namespace drawinglayer
if(nCount)
{
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
rContainer.push_back(new PolygonHairlinePrimitive2D(aPolyPolygon.getB2DPolygon(a), getBColor()));
}
......@@ -98,7 +98,7 @@ namespace drawinglayer
if(nCount)
{
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
rContainer.push_back(
new PolygonMarkerPrimitive2D(
......@@ -162,7 +162,7 @@ namespace drawinglayer
if(nCount)
{
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
rContainer.push_back(
new PolygonStrokePrimitive2D(
......
......@@ -61,9 +61,9 @@ namespace
{
const sal_uInt16 nDivisor(mnAntiAlialize * mnAntiAlialize);
for(sal_uInt32 y(0L); y < nHeight; y++)
for(sal_uInt32 y(0); y < nHeight; y++)
{
for(sal_uInt32 x(0L); x < nWidth; x++)
for(sal_uInt32 x(0); x < nWidth; x++)
{
sal_uInt16 nRed(0);
sal_uInt16 nGreen(0);
......@@ -100,11 +100,11 @@ namespace
}
else
{
sal_uInt32 nIndex(0L);
sal_uInt32 nIndex(0);
for(sal_uInt32 y(0L); y < nHeight; y++)
for(sal_uInt32 y(0); y < nHeight; y++)
{
for(sal_uInt32 x(0L); x < nWidth; x++)
for(sal_uInt32 x(0); x < nWidth; x++)
{
const basegfx::BPixel& rPixel(rRaster.getBPixel(nIndex++));
......
......@@ -76,7 +76,7 @@ namespace
: Timer( "drawinglayer ImpTimedRefDev destroy mpVirDev" ),
mrOwnerOfMe(rOwnerOfMe),
mpVirDev(nullptr),
mnUseCount(0L)
mnUseCount(0)
{
SetTimeout(3L * 60L * 1000L); // three minutes
Start();
......
......@@ -186,7 +186,7 @@ namespace drawinglayer
aRetval.resize(nCount);
// color-filled polypolygons
for(sal_uInt32 a(0L); a < nCount; a++)
for(sal_uInt32 a(0); a < nCount; a++)
{
// prepare polypolygon
basegfx::B2DPolyPolygon& rPolyPolygon = aB2DPolyPolyVector[a];
......
......@@ -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]))
{
......
......@@ -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()));
......
......@@ -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)));
}
......
......@@ -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)));
}
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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)));
}
......
......@@ -54,7 +54,7 @@ namespace drawinglayer
{
const sal_Int32 nCount(rSource.size());
for(sal_Int32 a(0L); a < nCount; a++)
for(sal_Int32 a(0); a < nCount; a++)
{
// get reference
const primitive2d::Primitive2DReference xReference(rSource[a]);
......
......@@ -47,7 +47,7 @@ namespace drawinglayer
{
const size_t nCount(rSource.size());
for(size_t a(0L); a < nCount; a++)
for(size_t a(0); a < nCount; a++)
{
// get reference
const primitive3d::Primitive3DReference xReference(rSource[a]);
......
......@@ -381,7 +381,7 @@ namespace drawinglayer
{
// get plane normal of polygon in view coordinates (with ZBuffer values),
// left-handed coordinate system
const basegfx::B3DVector aPlaneNormal(aFill.getB3DPolygon(0L).getNormal());
const basegfx::B3DVector aPlaneNormal(aFill.getB3DPolygon(0).getNormal());
if(aPlaneNormal.getZ() > 0.0)
{
......@@ -398,7 +398,7 @@ namespace drawinglayer
{
// get plane normal of polygon in view coordinates (with ZBuffer values),
// left-handed coordinate system
const basegfx::B3DVector aPlaneNormal(aFill.getB3DPolygon(0L).getNormal());
const basegfx::B3DVector aPlaneNormal(aFill.getB3DPolygon(0).getNormal());
if(aPlaneNormal.getZ() > 0.0)
{
......@@ -427,11 +427,11 @@ namespace drawinglayer
const sal_uInt16 nSpecularIntensity(rPrimitive.getMaterial().getSpecularIntensity());
// solve color model for each normal vector, set colors at points. Clear normals.
for(sal_uInt32 a(0L); a < aFill.count(); a++)
for(sal_uInt32 a(0); a < aFill.count(); a++)
{
basegfx::B3DPolygon aPartFill(aFill.getB3DPolygon(a));
for(sal_uInt32 b(0L); b < aPartFill.count(); b++)
for(sal_uInt32 b(0); b < aPartFill.count(); b++)
{
// solve color model. Transform normal to eye coor
const basegfx::B3DVector aNormal(aPartFill.getNormal(b));
......@@ -448,7 +448,7 @@ namespace drawinglayer
case css::drawing::ShadeMode_FLAT:
{
// flat shading. Get plane vector in eye coordinates
const basegfx::B3DVector aPlaneEyeNormal(aNormalTransform * rPrimitive.getB3DPolyPolygon().getB3DPolygon(0L).getNormal());
const basegfx::B3DVector aPlaneEyeNormal(aNormalTransform * rPrimitive.getB3DPolyPolygon().getB3DPolygon(0).getNormal());
// prepare color model parameters, evtl. use blend color
const basegfx::BColor aColor(getModulate() ? basegfx::BColor(1.0, 1.0, 1.0) : rPrimitive.getMaterial().getColor());
......
......@@ -257,7 +257,7 @@ namespace drawinglayer
{
basegfx::B2DPolygon aRetval;
for(sal_uInt32 a(0L); a < rSource.count(); a++)
for(sal_uInt32 a(0); a < rSource.count(); a++)
{
// get point, transform to eye coordinate system
basegfx::B3DPoint aCandidate(rSource.getB3DPoint(a));
......@@ -286,7 +286,7 @@ namespace drawinglayer
{
basegfx::B2DPolyPolygon aRetval;
for(sal_uInt32 a(0L); a < rSource.count(); a++)
for(sal_uInt32 a(0); a < rSource.count(); a++)
{
aRetval.append(impDoShadowProjection(rSource.getB3DPolygon(a)));