[Libreoffice-commits] core.git: comphelper/source connectivity/source drawinglayer/source editeng/source embedserv/source filter/source forms/source include/vcl ridljar/com sc/source sd/source sfx2/source slideshow/source sot/source starmath/source svgio/qa svl/source svtools/source svx/source sw/source toolkit/source tools/source vcl/qa vcl/source winaccessibility/source writerfilter/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Aug 17 06:17:18 UTC 2017
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 22 ++---
drawinglayer/source/animation/animationtiming.cxx | 2
drawinglayer/source/attribute/sdrlightingattribute3d.cxx | 2
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 2
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 4 -
drawinglayer/source/primitive2d/gridprimitive2d.cxx | 2
drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 2
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 4 -
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 6 -
drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 10 +-
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
drawinglayer/source/primitive2d/textprimitive2d.cxx | 2
drawinglayer/source/primitive3d/baseprimitive3d.cxx | 4 -
drawinglayer/source/primitive3d/polygonprimitive3d.cxx | 4 -
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 10 +-
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 6 -
drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 2
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 28 +++----
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 4 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2
drawinglayer/source/processor2d/baseprocessor2d.cxx | 2
drawinglayer/source/processor3d/baseprocessor3d.cxx | 2
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 10 +-
drawinglayer/source/processor3d/shadow3dextractor.cxx | 4 -
editeng/source/editeng/editeng.cxx | 2
editeng/source/items/svxfont.cxx | 2
editeng/source/misc/svxacorr.cxx | 2
editeng/source/misc/txtrange.cxx | 4 -
embedserv/source/embed/ed_ipersiststr.cxx | 2
embedserv/source/embed/iipaobj.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
filter/source/svg/svgreader.cxx | 4 -
forms/source/component/imgprod.cxx | 14 +--
include/vcl/dibtools.hxx | 6 -
include/vcl/errcode.hxx | 4 -
ridljar/com/sun/star/uno/UnoRuntime.java | 2
sc/source/filter/lotus/filter.cxx | 2
sc/source/filter/lotus/lotus.cxx | 4 -
sc/source/filter/starcalc/scflt.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/view/drawview.cxx | 2
sd/source/core/PageListWatcher.cxx | 6 -
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 8 +-
sd/source/ui/func/fumorph.cxx | 26 +++---
sd/source/ui/unoidl/unomodel.cxx | 4 -
sd/source/ui/view/sdwindow.cxx | 8 +-
sfx2/source/doc/docfile.cxx | 2
sfx2/source/view/impframe.hxx | 2
sfx2/source/view/lokcharthelper.cxx | 4 -
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 4 -
sot/source/sdstor/stg.cxx | 8 +-
sot/source/sdstor/stgdir.cxx | 16 ++--
sot/source/sdstor/stgelem.cxx | 4 -
sot/source/sdstor/stgole.cxx | 6 -
sot/source/sdstor/stgstrms.cxx | 6 -
sot/source/sdstor/storage.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 4 -
starmath/source/node.cxx | 2
starmath/source/parse.cxx | 2
svgio/qa/cppunit/SvgImportTest.cxx | 2
svl/source/items/lckbitem.cxx | 4 -
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/imivctl1.cxx | 4 -
svtools/source/graphic/grfcache.cxx | 4 -
svtools/source/svhtml/parhtml.cxx | 6 -
svtools/source/svrtf/svparser.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 2
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2
svx/source/customshapes/EnhancedCustomShape2d.cxx | 6 -
svx/source/dialog/_contdlg.cxx | 4 -
svx/source/dialog/dlgctrl.cxx | 2
svx/source/dialog/fontwork.cxx | 4 -
svx/source/dialog/imapwnd.cxx | 10 +-
svx/source/engine3d/extrud3d.cxx | 2
svx/source/engine3d/lathe3d.cxx | 4 -
svx/source/engine3d/polygn3d.cxx | 8 +-
svx/source/engine3d/view3d.cxx | 2
svx/source/engine3d/view3d1.cxx | 4 -
svx/source/form/fmPropBrw.cxx | 2
svx/source/gallery2/codec.cxx | 4 -
svx/source/gallery2/galmisc.cxx | 2
svx/source/gallery2/galtheme.cxx | 8 +-
svx/source/sdr/animation/animationstate.cxx | 2
svx/source/sdr/animation/scheduler.cxx | 4 -
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 2
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 6 -
svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 -
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 2
svx/source/sdr/properties/properties.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 4 -
svx/source/svdraw/polypolygoneditor.cxx | 2
svx/source/svdraw/sdrpagewindow.cxx | 8 +-
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 4 -
svx/source/svdraw/svdedtv1.cxx | 2
svx/source/svdraw/svdedtv2.cxx | 20 ++---
svx/source/svdraw/svdetc.cxx | 20 ++---
svx/source/svdraw/svdfmtf.cxx | 8 +-
svx/source/svdraw/svdhdl.cxx | 20 ++---
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svditer.cxx | 8 +-
svx/source/svdraw/svdmrkv.cxx | 6 -
svx/source/svdraw/svdoashp.cxx | 8 +-
svx/source/svdraw/svdobj.cxx | 6 -
svx/source/svdraw/svdocapt.cxx | 2
svx/source/svdraw/svdomeas.cxx | 16 ++--
svx/source/svdraw/svdoole2.cxx | 2
svx/source/svdraw/svdopath.cxx | 38 ++++-----
svx/source/svdraw/svdotextdecomposition.cxx | 2
svx/source/svdraw/svdotextpathdecomposition.cxx | 8 +-
svx/source/svdraw/svdpage.cxx | 14 +--
svx/source/svdraw/svdpagv.cxx | 10 +-
svx/source/svdraw/svdpntv.cxx | 14 +--
svx/source/svdraw/svdpoev.cxx | 2
svx/source/svdraw/svdsnpv.cxx | 6 -
svx/source/svdraw/svdview.cxx | 4 -
svx/source/svdraw/svdxcgv.cxx | 2
svx/source/table/cell.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 2
svx/source/unodraw/unoshap2.cxx | 8 +-
svx/source/unodraw/unoshap3.cxx | 12 +--
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xoutdev/_xpoly.cxx | 4 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 2
sw/source/core/draw/dcontact.cxx | 8 +-
sw/source/core/layout/anchoredobject.cxx | 2
sw/source/core/layout/atrfrm.cxx | 4 -
sw/source/core/layout/flowfrm.cxx | 2
sw/source/core/layout/flycnt.cxx | 4 -
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 12 +--
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 6 -
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/view/viewsh.cxx | 4 -
sw/source/filter/html/parcss1.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 4 -
sw/source/filter/ww8/wrtww8.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 4 -
sw/source/filter/xml/xmltble.cxx | 4 -
sw/source/filter/xml/xmltbli.cxx | 18 ++--
sw/source/filter/xml/xmltexte.cxx | 4 -
sw/source/uibase/app/docsh2.cxx | 6 -
sw/source/uibase/shells/beziersh.cxx | 2
toolkit/source/controls/stdtabcontrollermodel.cxx | 4 -
toolkit/source/controls/unocontrolmodel.cxx | 4 -
tools/source/generic/poly.cxx | 4 -
tools/source/stream/vcompat.cxx | 2
vcl/qa/cppunit/fontmetric.cxx | 6 -
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/igif/gifread.cxx | 4 -
vcl/source/gdi/animate.cxx | 2
vcl/source/gdi/dibtools.cxx | 40 +++++-----
vcl/source/gdi/impgraph.cxx | 12 +--
vcl/source/gdi/impvect.cxx | 8 +-
vcl/source/gdi/pngwrite.cxx | 2
vcl/source/window/scrwnd.cxx | 8 +-
winaccessibility/source/service/AccObject.cxx | 2
writerfilter/source/dmapper/WrapPolygonHandler.cxx | 2
xmloff/source/core/xmluconv.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 12 +--
xmloff/source/draw/sdxmlimp.cxx | 4 -
xmloff/source/draw/shapeexport.cxx | 6 -
xmloff/source/draw/xexptran.cxx | 8 +-
xmloff/source/draw/ximpnote.cxx | 2
175 files changed, 474 insertions(+), 474 deletions(-)
New commits:
commit ff1f6a5fc25db062e9a83521a657062f62f03ba6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 16 14:45:49 2017 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index af3725ae2eb2..19f755c866b7 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -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() );
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index d2a0476728f5..297c2933f122 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -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();
}
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index 955ec511e407..a4204ca2185b 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -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))
{
diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
index c2f44f26dff6..0302f129b581 100644
--- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
@@ -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));
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 63c25273e7aa..509ef9c6039e 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -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]));
}
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index df639fe77678..849fb1493379 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -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]))
{
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index cbc49ddd5669..9326d35b289d 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -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())
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 85bd17146f59..760022c53e7d 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -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());
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 147af59b6404..2f6deba32bfe 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -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
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 581435dd153a..a81922e52db0 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -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(
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 37879cd4a04b..3167d5f60d8f 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -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++));
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index ffad187e7217..2b1d09a70709 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -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();
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index ba3ea7a0a60e..0cf27bbba440 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -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];
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)));
}
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index 5f5dcf7e02ca..ba20e8d912b8 100644
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
@@ -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]);
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index 9c3659a80008..537a88860f9e 100644
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
@@ -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]);
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index ca51d04587ae..7e1dff308ee3 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -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());
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 25c6f54e917f..d325257f45e3 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -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)));
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 024b66a91fda..402f1abd88a7 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -515,7 +515,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
if(pLinePolyPolygon && 1L == rPolyPolygon.count())
{
- if(rPolyPolygon.getB2DPolygon(0L).isClosed())
+ if(rPolyPolygon.getB2DPolygon(0).isClosed())
{
// open polygon
bSimple = true;
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 7ecb575907b1..71117bece47c 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -353,7 +353,7 @@ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt,
{
const OUString aNewText = CalcCaseMap(rTxt);
bool bCaseMapLengthDiffers(aNewText.getLength() != rTxt.getLength());
- sal_Int32 nWidth(0L);
+ sal_Int32 nWidth(0);
if(bCaseMapLengthDiffers)
{
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3f52dec6ff34..d97961831540 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2003,7 +2003,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
xml::sax::InputSource aParserInput;
aParserInput.sSystemId = sStrmName;
- xStrm->Seek( 0L );
+ xStrm->Seek( 0 );
xStrm->SetBufferSize( 8 * 1024 );
aParserInput.aInputStream = new utl::OInputStreamWrapper( *xStrm );
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 08fd01941a27..9537f7e4a371 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -46,7 +46,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
sal_uInt32 nCount(rPolyPolygon.count());
mpPolyPolygon = new tools::PolyPolygon( (sal_uInt16)nCount );
- for(sal_uInt32 i(0L); i < nCount; i++)
+ for(sal_uInt32 i(0); i < nCount; i++)
{
const basegfx::B2DPolygon aCandidate(rPolyPolygon.getB2DPolygon(i).getDefaultAdaptiveSubdivision());
nPointCount += aCandidate.count();
@@ -58,7 +58,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
nCount = pLinePolyPolygon->count();
mpLinePolyPolygon = new tools::PolyPolygon();
- for(sal_uInt32 i(0L); i < nCount; i++)
+ for(sal_uInt32 i(0); i < nCount; i++)
{
const basegfx::B2DPolygon aCandidate(pLinePolyPolygon->getB2DPolygon(i).getDefaultAdaptiveSubdivision());
nPointCount += aCandidate.count();
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index cc4c77f5b920..17d0bc002497 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -164,7 +164,7 @@ HRESULT copyXTempOutToIStream( uno::Reference< io::XOutputStream > const & xTemp
EmbedDocument_Impl::EmbedDocument_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const GUID* guid )
-: m_refCount( 0L )
+: m_refCount( 0 )
, m_xFactory( xFactory )
, m_guid( *guid )
, m_bIsDirty( false )
diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx
index 528d4bf35068..376247c221f6 100644
--- a/embedserv/source/embed/iipaobj.cxx
+++ b/embedserv/source/embed/iipaobj.cxx
@@ -22,7 +22,7 @@
CIIAObj::CIIAObj(DocumentHolder* pDocHolder)
- : m_refCount( 0L ),
+ : m_refCount( 0 ),
m_rDocHolder( pDocHolder )
{
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index ab919b29d04b..763614d12645 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2596,7 +2596,7 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uIn
const PptSlidePersistEntry& rPersist = (*pPageList)[ nMasterNum ]; // get the masterpage's persistentry
if ( rPersist.pPresentationObjects )
{
- sal_uInt32 nCurrent(0L);
+ sal_uInt32 nCurrent(0);
DffRecordList* pCList = maShapeRecords.pCList; // we got a backup of the current position
if ( pCList )
nCurrent = pCList->nCurrent;
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 482a8343dbcd..79fb13c1e11c 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -134,7 +134,7 @@ bool PolyPolygonIsMixedOpenAndClosed( const basegfx::B2DPolyPolygon& rPoly )
// PolyPolygon is mixed open and closed if there is more than one
// polygon and there are both closed and open polygons.
- for( sal_uInt32 a(0L); !bRetval && a < rPoly.count(); a++ )
+ for( sal_uInt32 a(0); !bRetval && a < rPoly.count(); a++ )
{
if ( (rPoly.getB2DPolygon(a)).isClosed() )
{
@@ -1559,7 +1559,7 @@ struct ShapeWritingVisitor
// split mixed polypolygons into single polygons and add them one by one
if( PolyPolygonIsMixedOpenAndClosed(aPoly) )
{
- for( sal_uInt32 i(0L); i<aPoly.count(); ++i ) {
+ for( sal_uInt32 i(0); i<aPoly.count(); ++i ) {
writePathShape(xAttrs,
xUnoAttrs,
sStyleId,
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 666b7b016a6e..6dbb07227314 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -306,7 +306,7 @@ bool ImageProducer::ImplImportGraphic( Graphic& rGraphic )
if( ERRCODE_IO_PENDING == mpStm->GetError() )
mpStm->ResetError();
- mpStm->Seek( 0UL );
+ mpStm->Seek( 0 );
bool bRet = GraphicConverter::Import( *mpStm, rGraphic ) == ERRCODE_NONE;
@@ -364,9 +364,9 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
{
const BitmapColor& rCol = pBmpAcc->GetPaletteColor( (sal_uInt16) i );
- *pTmp = ( (sal_Int32) rCol.GetRed() ) << (sal_Int32)(24L);
- *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << (sal_Int32)(16L);
- *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << (sal_Int32)(8L);
+ *pTmp = ( (sal_Int32) rCol.GetRed() ) << (sal_Int32)(24);
+ *pTmp |= ( (sal_Int32) rCol.GetGreen() ) << (sal_Int32)(16);
+ *pTmp |= ( (sal_Int32) rCol.GetBlue() ) << (sal_Int32)(8);
*pTmp |= (sal_Int32)(0x000000ffL);
}
@@ -493,9 +493,9 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
{
const BitmapColor aCol( pBmpAcc->GetPixel( nY, nX ) );
- *pTmp = ( (sal_Int32) aCol.GetRed() ) << (sal_Int32)(24L);
- *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << (sal_Int32)(16L);
- *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << (sal_Int32)(8L);
+ *pTmp = ( (sal_Int32) aCol.GetRed() ) << 24;
+ *pTmp |= ( (sal_Int32) aCol.GetGreen() ) << 16;
+ *pTmp |= ( (sal_Int32) aCol.GetBlue() ) << 8;
if( pMskAcc->GetPixel( nY, nX ) != aWhite )
*pTmp |= 0x000000ffUL;
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx
index 0e4bf060ce71..75618ad609d7 100644
--- a/include/vcl/dibtools.hxx
+++ b/include/vcl/dibtools.hxx
@@ -32,9 +32,9 @@ class Bitmap;
// - Compression defines
-#define COMPRESS_NONE ( 0UL )
-#define RLE_8 ( 1UL )
-#define RLE_4 ( 2UL )
+#define COMPRESS_NONE ( 0 )
+#define RLE_8 ( 1 )
+#define RLE_4 ( 2 )
#define BITFIELDS ( 3UL )
#define ZCOMPRESS ( ('S'|('D'<<8UL)) | 0x01000000UL ) /* == 'SD01' (binary) */
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
index fb9018466c18..64684d912ada 100644
--- a/include/vcl/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -79,7 +79,7 @@ public:
/** convert to ERRCODE_NONE if it's a warning, else return the error */
ErrCode IgnoreWarning() const {
return (m_value & ERRCODE_WARNING_MASK)
- ? ErrCode(0UL)
+ ? ErrCode(0)
: ErrCode(static_cast<sal_uInt32>(m_value & ERRCODE_ERROR_MASK));
}
@@ -199,7 +199,7 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err)
#define ERRCODE_CLASS_RUNTIME (22 << ERRCODE_CLASS_SHIFT)
#define ERRCODE_CLASS_COMPILER (23 << ERRCODE_CLASS_SHIFT)
-#define ERRCODE_NONE ErrCode(0UL)
+#define ERRCODE_NONE ErrCode(0)
#define ERRCODE_IO_MISPLACEDCHAR ErrCode(1UL | ERRCODE_CLASS_PARAMETER | ERRCODE_AREA_IO)
#define ERRCODE_IO_NOTEXISTS ErrCode(2UL | ERRCODE_CLASS_NOTEXISTS | ERRCODE_AREA_IO)
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index 4bedc275c451..1cba9d8b0258 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -318,7 +318,7 @@ public class UnoRuntime {
return Integer.valueOf(0);
case TypeClass.HYPER_value:
case TypeClass.UNSIGNED_HYPER_value:
- return Long.valueOf(0L);
+ return Long.valueOf(0);
case TypeClass.FLOAT_value:
return new Float(0.0f);
case TypeClass.DOUBLE_value:
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index a6a843deec5c..7a1beac230f1 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -163,7 +163,7 @@ WKTYP ScanVersion(SvStream& aStream)
ErrCode ScImportLotus123old(LotusContext& rContext, SvStream& aStream, ScDocument* pDocument, rtl_TextEncoding eSrc )
{
- aStream.Seek( 0UL );
+ aStream.Seek( 0 );
// make document pointer global
rContext.pDoc = pDocument;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 8a7c8493225b..4b6295b1578d 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -40,7 +40,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume
ErrCode eRet;
- pStream->Seek( 0UL );
+ pStream->Seek( 0 );
pStream->SetBufferSize( 32768 );
@@ -56,7 +56,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume
// WARNING: QUICK-HACK for WK1 / WKS <-> WK3 / WK4
if( eRet == ErrCode(0xFFFFFFFF) )
{
- pStream->Seek( 0UL );
+ pStream->Seek( 0 );
pStream->SetBufferSize( 32768 );
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 32ef75272141..12210d2cf2f3 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -2402,7 +2402,7 @@ void Sc10Import::LoadObjects()
ErrCode ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument )
{
- rStream.Seek( 0UL );
+ rStream.Seek( 0 );
Sc10Import aImport( rStream, pDocument );
return aImport.Import();
}
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 23881dbda146..2ddcb309b920 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -567,7 +567,7 @@ void ScCsvRuler::ImplDrawBackgrDev()
maBackgrDev->SetFillColor();
sal_Int32 nPos;
- sal_Int32 nFirstPos = std::max( GetPosFromX( 0 ) - (sal_Int32)(1L), (sal_Int32)(0L) );
+ sal_Int32 nFirstPos = std::max( GetPosFromX( 0 ) - 1, (sal_Int32)(0) );
sal_Int32 nLastPos = GetPosFromX( GetWidth() );
sal_Int32 nY = (maActiveRect.Top() + maActiveRect.Bottom()) / 2;
for( nPos = nFirstPos; nPos <= nLastPos; ++nPos )
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 9a603cb37058..b7d24af70e47 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -503,7 +503,7 @@ void ScDrawView::MarkListHasChanged()
InvalidateAttribs(); // after the image map editor update
InvalidateDrawTextAttrs();
- for(sal_uInt32 a(0L); a < PaintWindowCount(); a++)
+ for(sal_uInt32 a(0); a < PaintWindowCount(); a++)
{
SdrPaintWindow* pPaintWindow = GetPaintWindow(a);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index d5e5dad9845f..283a798020e7 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -33,7 +33,7 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
- for(sal_uInt32 a(0L); a < nPageCount; a++)
+ for(sal_uInt32 a(0); a < nPageCount; a++)
{
SdPage* pCandidate = ImpGetPage(a);
DBG_ASSERT(pCandidate, "ImpPageListWatcher::ImpRecreateSortedPageListOnDemand: Invalid PageList in Model (!)");
@@ -127,7 +127,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind)
{
- sal_uInt32 nRetval(0L);
+ sal_uInt32 nRetval(0);
if(!mbPageListValid)
{
@@ -167,7 +167,7 @@ sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount()
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
- for(sal_uInt32 a(0L); a < nPageCount; a++)
+ for(sal_uInt32 a(0); a < nPageCount; a++)
{
SdPage* pCandidate = ImpGetPage(a);
if ((pCandidate->GetPageKind() == PageKind::Standard)&&(!pCandidate->IsExcluded())) nVisiblePageCount++;
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 5190622366d5..aedc5882a34c 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -36,7 +36,7 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev
mnWindowId (0)
{
// Search the output device to determine its id.
- for(sal_uInt32 a(0L); a < mpView->PaintWindowCount(); a++)
+ for(sal_uInt32 a(0); a < mpView->PaintWindowCount(); a++)
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(a);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 7468dd549a22..cc882a230eff 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -275,7 +275,7 @@ void SdPathHdl::CreateB2dIAObject()
if(pPageView)
{
- for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+ for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
{
const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 78d2ab62a195..1ac88bc5afdd 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -105,7 +105,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
return true;
// update status bar or show a error message?
- if(nInit == reinterpret_cast<void*>(1L))
+ if(nInit == reinterpret_cast<void*>(1))
{
ScopedVclPtrInstance< MessageDialog > aErrBox(this, SdResId(STR_BREAK_FAIL));
aErrBox->Execute();
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index fc39e1b57777..288612d7cad3 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -127,7 +127,7 @@ void CopyDlg::Reset()
// Set Min/Max values
::tools::Rectangle aRect = mpView->GetAllMarkedRect();
Size aPageSize = mpView->GetSdrPageView()->GetPage()->GetSize();
- SetMetricValue( *m_pMtrFldMoveX, Fraction(1000000L) / maUIScale, MapUnit::Map100thMM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(1000000) / maUIScale, MapUnit::Map100thMM);
double fScaleFactor = m_pMtrFldMoveX->GetValue()/1000000.0;
long nPageWidth = aPageSize.Width() * fScaleFactor;
@@ -151,7 +151,7 @@ void CopyDlg::Reset()
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, true, &pPoolItem ) )
m_pNumFldCopies->SetValue( static_cast<const SfxUInt16Item*>( pPoolItem )->GetValue() );
else
- m_pNumFldCopies->SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1 );
long nMoveX = 500L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
@@ -166,7 +166,7 @@ void CopyDlg::Reset()
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) )
m_pMtrFldAngle->SetValue( static_cast<const SfxInt32Item*>( pPoolItem )->GetValue() );
else
- m_pMtrFldAngle->SetValue( 0L );
+ m_pMtrFldAngle->SetValue( 0 );
long nWidth = 0L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
@@ -286,7 +286,7 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData, Button*, void)
*/
IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void)
{
- m_pNumFldCopies->SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1 );
long nValue = 500L;
SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 39a11f7da83c..1808a75f0597 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -128,11 +128,11 @@ void FuMorph::DoExecute( SfxRequest& )
{
aPolyPoly1 = ::basegfx::tools::correctOrientations(aPolyPoly1);
aPolyPoly1.removeDoublePoints();
- ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0L)));
+ ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0)));
aPolyPoly2 = ::basegfx::tools::correctOrientations(aPolyPoly2);
aPolyPoly2.removeDoublePoints();
- ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0L)));
+ ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0)));
// set same orientation
if(eIsClockwise1 != eIsClockwise2)
@@ -149,7 +149,7 @@ void FuMorph::DoExecute( SfxRequest& )
aPolyPoly2.flip();
// force same point counts
- for( sal_uInt32 a(0L); a < aPolyPoly1.count(); a++ )
+ for( sal_uInt32 a(0); a < aPolyPoly1.count(); a++ )
{
::basegfx::B2DPolygon aSub1(aPolyPoly1.getB2DPolygon(a));
::basegfx::B2DPolygon aSub2(aPolyPoly2.getB2DPolygon(a));
@@ -198,11 +198,11 @@ void FuMorph::DoExecute( SfxRequest& )
const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1L));
double fDestPos(0.0);
double fSrcPos(0.0);
- sal_uInt32 nSrcPos(0L);
+ sal_uInt32 nSrcPos(0);
sal_uInt32 nSrcPosNext((nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L);
double fNextSrcLen(::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength());
- for(sal_uInt32 b(0L); b < nNum; b++)
+ for(sal_uInt32 b(0); b < nNum; b++)
{
// calc fDestPos in source
while(fSrcPos + fNextSrcLen < fDestPos)
@@ -262,9 +262,9 @@ void FuMorph::ImpEqualizePolyPointCount(
// transpose points to have smooth linear blending
::basegfx::B2DPolygon aPoly2;
aPoly2.append(::basegfx::B2DPoint(), nCnt);
- sal_uInt32 nInd(ImpGetNearestIndex(aPoly1, aTrans * rBig.getB2DPoint(0L)));
+ sal_uInt32 nInd(ImpGetNearestIndex(aPoly1, aTrans * rBig.getB2DPoint(0)));
- for(sal_uInt32 a(0L); a < nCnt; a++)
+ for(sal_uInt32 a(0); a < nCnt; a++)
{
aPoly2.setB2DPoint((a + nCnt - nInd) % nCnt, aPoly1.getB2DPoint(a));
}
@@ -281,7 +281,7 @@ sal_uInt32 FuMorph::ImpGetNearestIndex(
double fMinDist = 0.0;
sal_uInt32 nActInd = 0;
- for(sal_uInt32 a(0L); a < rPoly.count(); a++)
+ for(sal_uInt32 a(0); a < rPoly.count(); a++)
{
double fNewDist(::basegfx::B2DVector(rPoly.getB2DPoint(a) - rPos).getLength());
@@ -310,13 +310,13 @@ void FuMorph::ImpAddPolys(
::basegfx::B2DPoint aNewPoint(aToBeCopiedPolySize.getCenter());
::basegfx::B2DPolygon aNewPoly;
- const ::basegfx::B2DRange aSrcSize(::basegfx::tools::getRange(rBigger.getB2DPolygon(0L)));
+ const ::basegfx::B2DRange aSrcSize(::basegfx::tools::getRange(rBigger.getB2DPolygon(0)));
const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter());
- const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmaller.getB2DPolygon(0L)));
+ const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmaller.getB2DPolygon(0)));
const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter());
aNewPoint = aNewPoint - aSrcPos + aDstPos;
- for(sal_uInt32 a(0L); a < aToBeCopied.count(); a++)
+ for(sal_uInt32 a(0); a < aToBeCopied.count(); a++)
{
aNewPoly.append(aNewPoint);
}
@@ -455,14 +455,14 @@ void FuMorph::ImpInsertPolygons(
::basegfx::B2DPolyPolygon* pNewPolyPolygon = new ::basegfx::B2DPolyPolygon();
const double fFactor = 1.0 - fMorphingFactor;
- for(sal_uInt32 a(0L); a < rPolyPolyStart.count(); a++)
+ for(sal_uInt32 a(0); a < rPolyPolyStart.count(); a++)
{
const ::basegfx::B2DPolygon aPolyStart(rPolyPolyStart.getB2DPolygon(a));
const ::basegfx::B2DPolygon aPolyEnd(rPolyPolyEnd.getB2DPolygon(a));
const sal_uInt32 nCount(aPolyStart.count());
::basegfx::B2DPolygon aNewPolygon;
- for(sal_uInt32 b(0L); b < nCount; b++)
+ for(sal_uInt32 b(0); b < nCount; b++)
{
const ::basegfx::B2DPoint& aPtStart(aPolyStart.getB2DPoint(b));
const ::basegfx::B2DPoint& aPtEnd(aPolyEnd.getB2DPoint(b));
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 26ae2ba7ac39..e3f49c9c2321 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2245,9 +2245,9 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice,
// that VirtualDevices use a DPI of 96.
// We specifically calculate these scales first as we're still
// in TWIPs, and might as well minimize the number of conversions.
- Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
+ Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440) /
Fraction( nTileWidth);
- Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
+ Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440) /
Fraction( nTileHeight);
// svx seems to be the only component that works natively in
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index ce5d5ba1fa43..92c0be3b69bd 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -396,8 +396,8 @@ long Window::GetZoomForRect( const ::tools::Rectangle& rZoomRect )
// rectangle being fully visible (when translated accordingly) as
// large as possible in the output area independently in both
// coordinate directions .
- sal_uLong nX(0L);
- sal_uLong nY(0L);
+ sal_uLong nX(0);
+ sal_uLong nY(0);
const Size aWinSize( PixelToLogic(GetOutputSizePixel()) );
if(rZoomRect.GetHeight())
@@ -470,8 +470,8 @@ long Window::SetZoomRect (const ::tools::Rectangle& rZoomRect)
// rectangle being fully visible (when translated accordingly) as
// large as possible in the output area independently in both
// coordinate directions .
- sal_uLong nX(0L);
- sal_uLong nY(0L);
+ sal_uLong nX(0);
+ sal_uLong nY(0);
if(rZoomRect.GetHeight())
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 964c3bac2b0a..7930427925cf 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1469,7 +1469,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo )
{
pImpl->xStorage.clear();
if ( pImpl->m_pInStream )
- pImpl->m_pInStream->Seek( 0L );
+ pImpl->m_pInStream->Seek( 0 );
}
pImpl->bIsStorage = pImpl->xStorage.is();
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 7d837cde0c00..25b4a392d4fd 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -54,7 +54,7 @@ public:
bool bMenuBarOn;
explicit SfxFrame_Impl()
- :nType( 0L )
+ :nType( 0 )
,pCurrentViewFrame( nullptr )
,pDescr( nullptr )
,bClosing(false)
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index fffbc3efa58e..65045013ca1d 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -244,8 +244,8 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& rDevice,
// Scaling. Must convert from pixels to twips. We know
// that VirtualDevices use a DPI of 96.
- Fraction scaleX = Fraction(nOutputWidth, 96) * Fraction(1440L) / Fraction(nTileWidth);
- Fraction scaleY = Fraction(nOutputHeight, 96) * Fraction(1440L) / Fraction(nTileHeight);
+ Fraction scaleX = Fraction(nOutputWidth, 96) * Fraction(1440) / Fraction(nTileWidth);
+ Fraction scaleY = Fraction(nOutputHeight, 96) * Fraction(1440) / Fraction(nTileHeight);
aMapMode.SetScaleX(scaleX);
aMapMode.SetScaleY(scaleY);
rDevice.SetMapMode(aMapMode);
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 503a0a4dc250..242376f27b29 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -318,7 +318,7 @@ sal_uInt32 ActivityImpl::GetStepWidthLogic() const
// #i69847# Assuming higher DPI
sal_uInt32 const PIXEL_TO_LOGIC = 30;
- sal_uInt32 nRetval(0L);
+ sal_uInt32 nRetval(0);
if(mnStepWidth < 0L)
{
@@ -555,7 +555,7 @@ ScrollTextAnimNode* ActivityImpl::ImpGetScrollTextAnimNode(
sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime)
{
- sal_uInt32 nRetval(0L);
+ sal_uInt32 nRetval(0);
ImpForceScrollTextAnimNodes();
if(!maVector.empty())
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index e744a357d351..a668917cfd13 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -154,7 +154,7 @@ bool OLEStorageBase::ValidateMode_Impl( StreamMode m, StgDirEntry* p )
StorageStream::StorageStream( StgIo* p, StgDirEntry* q, StreamMode m )
- : OLEStorageBase( p, q, m_nMode ), nPos( 0L )
+ : OLEStorageBase( p, q, m_nMode ), nPos( 0 )
{
// The dir entry may be 0; this means that the stream is invalid.
if( q && p )
@@ -375,7 +375,7 @@ Storage::Storage( SvStream& r, bool bDirect )
{
pIo->SetStrm( &r, false );
sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END );
- r.Seek( 0L );
+ r.Seek( 0 );
// Initializing is OK if the stream is empty
Init( nSize == 0 );
if( pEntry )
@@ -420,7 +420,7 @@ Storage::Storage( UCBStorageStream& rStrm, bool bDirect )
pIo->SetStrm( &rStrm );
sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END );
- pStream->Seek( 0L );
+ pStream->Seek( 0 );
// Initializing is OK if the stream is empty
Init( nSize == 0 );
if( pEntry )
@@ -445,7 +445,7 @@ void Storage::Init( bool bCreate )
if( pIo->Good() && pIo->GetStrm() )
{
sal_uLong nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
- pIo->GetStrm()->Seek( 0L );
+ pIo->GetStrm()->Seek( 0 );
if( nSize )
{
bHdrLoaded = pIo->Load();
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 952fd3879683..7bcae2f707c8 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -269,7 +269,7 @@ void StgDirEntry::OpenStream( StgIo& rIo )
if( m_bInvalid && m_aEntry.GetSize() )
{
// This entry has invalid data, so delete that data
- SetSize( 0L );
+ SetSize( 0 );
// bRemoved = bInvalid = false;
}
m_nPos = 0;
@@ -355,8 +355,8 @@ bool StgDirEntry::SetSize( sal_Int32 nNewSize )
if( nOldSize )
{
std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nOldSize ]);
- pOld->Pos2Page( 0L );
- m_pStgStrm->Pos2Page( 0L );
+ pOld->Pos2Page( 0 );
+ m_pStgStrm->Pos2Page( 0 );
if( pOld->Read( pBuf.get(), nOldSize )
&& m_pStgStrm->Write( pBuf.get(), nOldSize ) )
bRes = true;
@@ -500,8 +500,8 @@ void StgDirEntry::Copy( BaseStorageStream& rDest )
sal_uLong Pos = rDest.Tell();
sal_uInt8 aTempBytes[ 4096 ];
void* p = static_cast<void*>( aTempBytes );
- Seek( 0L );
- rDest.Seek( 0L );
+ Seek( 0 );
+ rDest.Seek( 0 );
while( n )
{
sal_Int32 nn = n;
@@ -576,7 +576,7 @@ bool StgDirEntry::Strm2Tmp()
sal_uInt8 aTempBytes[ 4096 ];
void* p = static_cast<void*>( aTempBytes );
- m_pStgStrm->Pos2Page( 0L );
+ m_pStgStrm->Pos2Page( 0 );
while( n )
{
sal_uLong nn = n;
@@ -636,7 +636,7 @@ bool StgDirEntry::Tmp2Strm()
if( pNewStrm->SetSize( n ) )
{
sal_uInt8 p[ 4096 ];
- m_pTmpStrm->Seek( 0L );
+ m_pTmpStrm->Seek( 0 );
while( n )
{
sal_uLong nn = n;
@@ -657,7 +657,7 @@ bool StgDirEntry::Tmp2Strm()
}
else
{
- m_pStgStrm->SetSize( 0L );
+ m_pStgStrm->SetSize( 0 );
delete m_pStgStrm;
m_pStgStrm = pNewStrm;
pNewStrm->SetEntry( *this );
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 0fb80c4a36cc..4e18d0e1b4d0 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -129,7 +129,7 @@ bool StgHeader::Load( StgIo& rIo )
bool StgHeader::Load( SvStream& r )
{
- r.Seek( 0L );
+ r.Seek( 0 );
r.ReadBytes( m_cSignature, 8 );
ReadClsId( r, m_aClsId ); // 08 Class ID
r.ReadInt32( m_nVersion ) // 1A version number
@@ -157,7 +157,7 @@ bool StgHeader::Store( StgIo& rIo )
return true;
SvStream& r = *rIo.GetStrm();
- r.Seek( 0L );
+ r.Seek( 0 );
r.WriteBytes( m_cSignature, 8 );
WriteClsId( r, m_aClsId ); // 08 Class ID
r.WriteInt32( m_nVersion ) // 1A version number
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index a00e706e38de..8b5a8dbca478 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -107,7 +107,7 @@ bool StgCompObjStream::Load()
m_aUserName.clear();
if( GetError() != ERRCODE_NONE )
return false;
- Seek( 8L ); // skip the first part
+ Seek( 8 ); // skip the first part
sal_Int32 nMarker = 0;
ReadInt32( nMarker );
if( nMarker == -1L )
@@ -144,7 +144,7 @@ bool StgCompObjStream::Store()
{
if( GetError() != ERRCODE_NONE )
return false;
- Seek( 0L );
+ Seek( 0 );
OString aAsciiUserName(OUStringToOString(m_aUserName, RTL_TEXTENCODING_MS_1252));
WriteInt16( 1 ); // Version?
WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator
@@ -172,7 +172,7 @@ bool StgOleStream::Store()
if( GetError() != ERRCODE_NONE )
return false;
- Seek( 0L );
+ Seek( 0 );
WriteInt32( 0x02000001 ); // OLE version, format
WriteInt32( 0 ); // Object flags
WriteInt32( 0 ); // Update Options
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 4e957d3e9355..a60b13db55b7 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -1145,8 +1145,8 @@ bool StgTmpStrm::Copy( StgTmpStrm& rSrc )
if( GetError() == ERRCODE_NONE )
{
std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]);
- rSrc.Seek( 0L );
- Seek( 0L );
+ rSrc.Seek( 0 );
+ Seek( 0 );
while( n )
{
const sal_uInt64 nn = std::min<sal_uInt64>(n, 4096);
@@ -1204,7 +1204,7 @@ void StgTmpStrm::SetSize(sal_uInt64 n)
std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]);
if( i )
{
- Seek( 0L );
+ Seek( 0 );
while( i )
{
const sal_uInt64 nb = std::min<sal_uInt64>(i, 4096);
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 13e6c7d08ab4..4445872b5f2b 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -199,7 +199,7 @@ void SotStorageStream::CopyTo( SotStorageStream * pDestStm )
{
// If Ole2 or not only own StorageStreams
sal_uLong nPos = Tell(); // save position
- Seek( 0L );
+ Seek( 0 );
pDestStm->SetSize( 0 ); // empty target stream
std::unique_ptr<sal_uInt8[]> pMem(new sal_uInt8[ 8192 ]);
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 55e4920d9ac6..f67d68666fee 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1332,8 +1332,8 @@ void UCBStorageStream::CopyTo( BaseStorageStream* pDestStm )
if( pDestStm->SetSize( n ) && n )
{
std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]);
- Seek( 0L );
- pDestStm->Seek( 0L );
+ Seek( 0 );
+ pDestStm->Seek( 0 );
while( n )
{
sal_uInt32 nn = n;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 086e69d34d07..e4b0aae6f3b6 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -174,7 +174,7 @@ void SmNode::SetFontSize(const Fraction &rSize, FontSizeType nType)
break;
case FontSizeType::DIVIDE:
- if (rSize != Fraction(0L))
+ if (rSize != Fraction(0))
aFntSize.Height() = static_cast<long>(Fraction(aFntSize.Height()) / rSize);
break;
default:
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 934a91412329..12f8e4269117 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1806,7 +1806,7 @@ SmStructureNode *SmParser::DoFontSize()
}
// get number argument
- Fraction aValue( 1L );
+ Fraction aValue( 1 );
if (lcl_IsNumber( m_aCurToken.aText ))
{
double fTmp = m_aCurToken.aText.toDouble();
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx
index da3e200a6285..566ee420d41e 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -141,7 +141,7 @@ bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive
if(nCount != rB.getLength())
return false;
- for(sal_Int32 a(0L); a < nCount; a++) {
+ for(sal_Int32 a(0); a < nCount; a++) {
if(!drawinglayer::primitive2d::arePrimitive2DReferencesEqual(rA[a], rB[a]))
return false;
}
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 837e3ede5343..a3f89de4c339 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -36,7 +36,7 @@ SfxLockBytesItem::SfxLockBytesItem()
SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream )
: SfxPoolItem( nW )
{
- rStream.Seek( 0L );
+ rStream.Seek( 0 );
_xVal = new SvLockBytes( new SvMemoryStream(), true );
SvStream aLockBytesStream( _xVal.get() );
@@ -96,7 +96,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const
{
SvStream aLockBytesStream( _xVal.get() );
sal_uInt32 nSize = aLockBytesStream.Seek( STREAM_SEEK_TO_END );
- aLockBytesStream.Seek( 0L );
+ aLockBytesStream.Seek( 0 );
rStream.WriteUInt32( nSize );
rStream.WriteStream( aLockBytesStream );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 36427600ea51..5b429bc5a406 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1551,7 +1551,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout;
OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" );
if ( nMinTimeout <= 0 )
- nMinTimeout = sal_Int32( 1000L );
+ nMinTimeout = sal_Int32( 1000 );
pTimeout->Seconds = nMinTimeout / 1000L;
pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 1000000L;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 0147ef4f8527..c1d96f4e8cc2 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2731,8 +2731,8 @@ void SvxIconChoiceCtrl_Impl::DrawFocusRect(vcl::RenderContext& rRenderContext)
LineInfo aLineInfo(LineStyle::Dash);
aLineInfo.SetDashLen(1);
- aLineInfo.SetDotLen(1L);
- aLineInfo.SetDistance(1L);
+ aLineInfo.SetDotLen(1);
+ aLineInfo.SetDistance(1);
aLineInfo.SetDotCount(1);
rRenderContext.DrawPolyLine(aPolygon, aLineInfo);
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 8c31a48375be..f98534c95adf 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -824,10 +824,10 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const
GraphicCache::GraphicCache( sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDisplayCacheSize ) :
maReleaseTimer ( "svtools::GraphicCache maReleaseTimer" ),
- mnReleaseTimeoutSeconds ( 0UL ),
+ mnReleaseTimeoutSeconds ( 0 ),
mnMaxDisplaySize ( nDisplayCacheSize ),
mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ),
- mnUsedDisplaySize ( 0UL )
+ mnUsedDisplaySize ( 0 )
{
maReleaseTimer.SetInvokeHandler( LINK( this, GraphicCache, ReleaseTimeoutHdl ) );
maReleaseTimer.SetTimeout( 10000 );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 1f479973497e..d576dd8fef05 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -42,9 +42,9 @@
using namespace ::com::sun::star;
-const sal_Int32 MAX_LEN( 1024L );
+const sal_Int32 MAX_LEN( 1024 );
-const sal_Int32 MAX_ENTITY_LEN( 8L );
+const sal_Int32 MAX_ENTITY_LEN( 8 );
// Tables to convert option values into strings
@@ -876,7 +876,7 @@ HtmlTokenId HTMLParser::GetNextRawToken()
nNextCh = '<';
// Don't append string to token.
- sTmpBuffer.setLength( 0L );
+ sTmpBuffer.setLength( 0 );
}
else
{
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 9c14b421382e..541aa5276c2d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -440,7 +440,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
if( c == '\n' )
{
IncLineNr();
- SetLinePos( 1L );
+ SetLinePos( 1 );
}
else
IncLinePos();
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index c2a7aa15cce5..4dc9ab0b6987 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -684,7 +684,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground()
sal_Int32 SAL_CALL AccessibleShape::getBackground()
{
ThrowIfDisposed ();
- sal_Int32 nColor (0L);
+ sal_Int32 nColor (0);
try
{
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 741c58daaef3..318733beae70 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -753,7 +753,7 @@ tools::Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const
if( mpView && mpView->PaintWindowCount())
{
- SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(0L);
+ SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(0);
aVisArea = pPaintWindow->GetVisibleArea();
}
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 1180ffde845c..3fc59dcdaf6a 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1470,7 +1470,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen
{
const EnhancedCustomShapeParameterPair* pTmp = seqCoordinates.getArray();
- for ( sal_Int32 nPtNum(0L); nPtNum < nCoordSize; nPtNum++ )
+ for ( sal_Int32 nPtNum(0); nPtNum < nCoordSize; nPtNum++ )
{
const Point aTempPoint(GetPoint( *pTmp++, true, true ));
aNewB2DPolygon.append(basegfx::B2DPoint(aTempPoint.X(), aTempPoint.Y()));
@@ -1726,7 +1726,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen
case QUADRATICCURVETO :
{
- for ( sal_Int32 i(0L); ( i < nPntCount ) && ( rSrcPt + 1 < nCoordSize ); i++ )
+ for ( sal_Int32 i(0); ( i < nPntCount ) && ( rSrcPt + 1 < nCoordSize ); i++ )
{
if ( rSrcPt )
{
@@ -1756,7 +1756,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen
case LINETO :
{
- for ( sal_Int32 i(0L); ( i < nPntCount ) && ( rSrcPt < nCoordSize ); i++ )
+ for ( sal_Int32 i(0); ( i < nPntCount ) && ( rSrcPt < nCoordSize ); i++ )
{
const Point aTempPoint(GetPoint( seqCoordinates[ rSrcPt++ ], true, true ));
SAL_INFO(
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c9738a0d9095..133a2d1f026a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -218,7 +218,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
pUpdateEditingObject( nullptr ),
pCheckObj ( nullptr ),
aContourItem ( *this, *_pBindings ),
- nGrfChanged ( 0UL ),
+ nGrfChanged ( 0 ),
bExecState ( false ),
bUpdateGraphicLinked( false ),
bGraphicLinked ( false )
@@ -276,7 +276,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
aPos.X() += aTbxSize.Width() + LogicToPixel( Size( 3, 0 ), MapMode( MapUnit::MapAppFont ) ).Width();
m_pMtfTolerance->SetPosPixel( aPos );
- m_pMtfTolerance->SetValue( 10L );
+ m_pMtfTolerance->SetValue( 10 );
SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 2edd2699da38..8dfad90aaae1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1581,7 +1581,7 @@ void SvxXLinePreview::Resize()
SvxPreviewBase::Resize();
const Size aOutputSize(GetOutputSize());
- const sal_Int32 nDistance(500L);
+ const sal_Int32 nDistance(500);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
// create DrawObectA
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 7ee1da514845..7735b99e26d3 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -765,8 +765,8 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Timer *, void)
nValue = GetCoreValue(*m_pMtrFldTextStart, MapUnit::Map100thMM);
XFormTextStartItem aStartItem( nValue );
- sal_Int32 nValueX(0L);
- sal_Int32 nValueY(0L);
+ sal_Int32 nValueX(0);
+ sal_Int32 nValueY(0);
// #i19251#
// The two involved fields/items are used double and contain/give different
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index ce44fc65a89e..910fdcfa85ca 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -99,7 +99,7 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap )
if(GetSdrModel())
{
// try to access page
- pPage = GetSdrModel()->GetPage(0L);
+ pPage = GetSdrModel()->GetPage(0);
}
if(pPage)
@@ -309,7 +309,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
{
SdrCircObj* pCircObj = const_cast<SdrCircObj*>( static_cast<const SdrCircObj*>(&rObj) );
SdrPathObj* pPathObj = static_cast<SdrPathObj*>( pCircObj->ConvertToPolyObj( false, false ) );
- tools::Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
+ tools::Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0));
delete pPathObj;
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, "", "", "", "", "", true, false );
@@ -328,7 +328,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
- tools::Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
+ tools::Polygon aPoly(rXPolyPoly.getB2DPolygon(0));
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, "", "", "", "", "", true, false );
pPathObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -375,7 +375,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
{
const SdrCircObj& rCircObj = static_cast<const SdrCircObj&>(rObj);
SdrPathObj* pPathObj = static_cast<SdrPathObj*>( rCircObj.ConvertToPolyObj( false, false ) );
- tools::Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
+ tools::Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0));
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, false );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
@@ -396,7 +396,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
- tools::Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
+ tools::Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0));
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, false );
pUserData->ReplaceObject( IMapObjectPtr(pObj) );
}
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 709b1790d1df..a5b88988b6c6 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -153,7 +153,7 @@ SdrAttrObj* E3dExtrudeObj::GetBreakObj()
basegfx::B2DPolyPolygon aTemp(maExtrudePolygon);
aTemp.removeDoublePoints();
aTemp = basegfx::tools::correctOrientations(aTemp);
- const basegfx::B2VectorOrientation aOrient = basegfx::tools::getOrientation(aTemp.getB2DPolygon(0L));
+ const basegfx::B2VectorOrientation aOrient = basegfx::tools::getOrientation(aTemp.getB2DPolygon(0));
if(basegfx::B2VectorOrientation::Positive == aOrient)
{
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index a13132697d07..4050088de028 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -70,7 +70,7 @@ E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyP
if(maPolyPoly2D.count())
{
- const basegfx::B2DPolygon rPoly(maPolyPoly2D.getB2DPolygon(0L));
+ const basegfx::B2DPolygon rPoly(maPolyPoly2D.getB2DPolygon(0));
sal_uInt32 nSegCnt(rPoly.count());
if(nSegCnt && !rPoly.isClosed())
@@ -127,7 +127,7 @@ void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew)
if(maPolyPoly2D.count())
{
- const basegfx::B2DPolygon rPoly(maPolyPoly2D.getB2DPolygon(0L));
+ const basegfx::B2DPolygon rPoly(maPolyPoly2D.getB2DPolygon(0));
sal_uInt32 nSegCnt(rPoly.count());
if(nSegCnt && !rPoly.isClosed())
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index cd9b6c33d7a5..78295eb57df6 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -61,7 +61,7 @@ void E3dPolygonObj::CreateDefaultNormals()
basegfx::B3DPolyPolygon aPolyNormals;
// Create a complete tools::PolyPolygon with the plane normal
- for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++)
+ for(sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
{
// Find source polygon
const basegfx::B3DPolygon aPolygon(aPolyPoly3D.getB3DPolygon(a));
@@ -73,7 +73,7 @@ void E3dPolygonObj::CreateDefaultNormals()
basegfx::B3DVector aNormal(-aPolygon.getNormal());
// Fill new polygon
- for(sal_uInt32 b(0L); b < aPolygon.count(); b++)
+ for(sal_uInt32 b(0); b < aPolygon.count(); b++)
{
aNormals.append(aNormal);
}
@@ -92,7 +92,7 @@ void E3dPolygonObj::CreateDefaultTexture()
// Create a complete tools::PolyPolygon with the texture coordinates
// The texture coordinates extend over X,Y and Z
// on the whole extreme values in the range 0.0 .. 1.0
- for(sal_uInt32 a(0L); a < aPolyPoly3D.count(); a++)
+ for(sal_uInt32 a(0); a < aPolyPoly3D.count(); a++)
{
// Find source polygon
const basegfx::B3DPolygon& aPolygon(aPolyPoly3D.getB3DPolygon(a));
@@ -128,7 +128,7 @@ void E3dPolygonObj::CreateDefaultTexture()
basegfx::B2DPolygon aTexture;
// Fill new polygon
- for(sal_uInt32 b(0L); b < aPolygon.count(); b++)
+ for(sal_uInt32 b(0); b < aPolygon.count(); b++)
{
basegfx::B2DPoint aTex;
const basegfx::B3DPoint aCandidate(aPolygon.getB3DPoint(b));
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 1abac13458b3..fd9c5451c2e0 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -689,7 +689,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
if(pObj->GetPage() && GetModel()->IsUndoEnabled() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
pObj->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE));
- pObj->SetMergedItem(XLineWidthItem(0L));
+ pObj->SetMergedItem(XLineWidthItem(0));
}
}
}
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 9027efbbe219..d3560ea3f466 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -105,7 +105,7 @@ SfxItemSet E3dView::Get3DAttributes() const
svl::Items<SDRATTR_START, SDRATTR_END,
SID_ATTR_3D_INTERN, SID_ATTR_3D_INTERN>{});
- sal_uInt32 nSelectedItems(0L);
+ sal_uInt32 nSelectedItems(0);
// get attributes from all selected objects
MergeAttrFromMarked(aSet, false);
@@ -145,7 +145,7 @@ SfxItemSet E3dView::Get3DAttributes() const
void E3dView::Set3DAttributes( const SfxItemSet& rAttr)
{
- sal_uInt32 nSelectedItems(0L);
+ sal_uInt32 nSelectedItems(0);
// #i94832# removed usage of E3DModifySceneSnapRectUpdater here.
// They are not needed here, they are already handled in SetAttrToMarked
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index af805f82f681..b5459b8f074e 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -516,7 +516,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
if(pPageView)
{
- SdrPageWindow* pPageWindow = pPageView->GetPageWindow(0L);
+ SdrPageWindow* pPageWindow = pPageView->GetPageWindow(0);
if(pPageWindow)
{
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index aeb7a5dd0066..2b8b74d8f6e9 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -63,13 +63,13 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
rStmToWrite.Seek( STREAM_SEEK_TO_END );
const sal_uInt32 nSize = rStmToWrite.Tell();
- rStmToWrite.Seek( 0UL );
+ rStmToWrite.Seek( 0 );
rStm.WriteChar( 'S' ).WriteChar( 'V' ).WriteChar( 'R' ).WriteChar( 'L' ).WriteChar( 'E' ).WriteChar( '2' );
rStm.WriteUInt32( nSize );
nPos = rStm.Tell();
- rStm.SeekRel( 4UL );
+ rStm.SeekRel( 4 );
ZCodec aCodec;
aCodec.BeginCompression();
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index e77ed61a49fa..c32441d09fac 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -102,7 +102,7 @@ bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
GalleryCodec aCodec( rIStm );
aCodec.Read( aMemStm );
- aMemStm.Seek( 0UL );
+ aMemStm.Seek( 0 );
if( 1 == nVersion )
{
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 4f2d92dd4b92..961ebed99d76 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -584,7 +584,7 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize
if( !InsertObject( aNewObj ) )
pEntry->mbDelete = true;
- pIStm->SetBufferSize( 0L );
+ pIStm->SetBufferSize( 0 );
}
}
}
@@ -941,7 +941,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel )
{
xIStm->SetBufferSize( STREAMBUF_SIZE );
bRet = GallerySvDrawImport( *xIStm, rModel );
- xIStm->SetBufferSize( 0L );
+ xIStm->SetBufferSize( 0 );
}
}
}
@@ -986,7 +986,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo
bRet = InsertObject( aObjSvDraw, nInsertPos );
}
- xOStm->SetBufferSize( 0L );
+ xOStm->SetBufferSize( 0 );
xOStm->Commit();
}
}
@@ -1071,7 +1071,7 @@ bool GalleryTheme::InsertModelStream( const tools::SvRef<SotStorageStream>& rxMo
bRet = InsertObject( aObjSvDraw, nInsertPos );
}
- xOStm->SetBufferSize( 0L );
+ xOStm->SetBufferSize( 0 );
xOStm->Commit();
}
}
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 85b94a664000..6bb9af2d6483 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -39,7 +39,7 @@ namespace sdr
{
const sal_Int32 nCount(maAnimatedPrimitives.size());
- for(sal_Int32 a(0L); a < nCount; a++)
+ for(sal_Int32 a(0); a < nCount; a++)
{
const drawinglayer::primitive2d::Primitive2DReference xRef(maAnimatedPrimitives[a]);
const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D* pCandidate = dynamic_cast< const drawinglayer::primitive2d::AnimatedSwitchPrimitive2D* >(xRef.get());
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 9936dfdb4be6..5956bce648ff 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -52,8 +52,8 @@ namespace sdr
Scheduler::Scheduler()
- : mnTime(0L),
- mnDeltaTime(0L),
+ : mnTime(0),
+ mnDeltaTime(0),
mbIsPaused(false)
{
}
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 8af2e51a36f2..f3362376fac1 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -105,7 +105,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo)
// collect primitive data in a sequence; this will already use the updated ViewInformation2D
drawinglayer::primitive2d::Primitive2DContainer xPrimitiveSequence;
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
const ViewObjectContact& rViewObjectContact = GetPaintObjectViewContact(a).GetViewObjectContact(*this);
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index ae3f5719dadf..76e2b49d5fd6 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -58,7 +58,7 @@ namespace sdr
if(bNormals || bTexture)
{
- for(sal_uInt32 a(0L); a < aPolyPolygon3D.count(); a++)
+ for(sal_uInt32 a(0); a < aPolyPolygon3D.count(); a++)
{
basegfx::B3DPolygon aCandidate3D(aPolyPolygon3D.getB3DPolygon(a));
basegfx::B3DPolygon aNormals3D;
@@ -74,7 +74,7 @@ namespace sdr
aTexture2D = aPolyTexture2D.getB2DPolygon(a);
}
- for(sal_uInt32 b(0L); b < aCandidate3D.count(); b++)
+ for(sal_uInt32 b(0); b < aCandidate3D.count(); b++)
{
if(bNormals)
{
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index f3e2a366a0f2..591db03619fb 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -58,7 +58,7 @@ void createSubPrimitive3DVector(
drawinglayer::primitive3d::Primitive3DContainer aNewVisibleTarget;
// add children recursively
- for(sal_uInt32 a(0L); a < nChildrenCount; a++)
+ for(sal_uInt32 a(0); a < nChildrenCount; a++)
{
createSubPrimitive3DVector(
rCandidate.GetViewContact(a),
@@ -286,7 +286,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3dScene::createSce
// a 3D transformPrimitive for the start scene. While this is theoretically not
// a bad thing, for historical reasons the transformation of the outmost scene
// is seen as part of the ViewTransformation (see text in createViewInformation3D)
- for(sal_uInt32 a(0L); a < nChildrenCount; a++)
+ for(sal_uInt32 a(0); a < nChildrenCount; a++)
{
createSubPrimitive3DVector(
GetViewContact(a),
@@ -429,7 +429,7 @@ drawinglayer::primitive3d::Primitive3DContainer ViewContactOfE3dScene::getAllPri
// a 3D transformPrimitive for the start scene. While this is theoretically not
// a bad thing, for historical reasons the transformation of the outmost scene
// is seen as part of the ViewTransformation (see text in createViewInformation3D)
- for(sal_uInt32 a(0L); a < nChildrenCount; a++)
+ for(sal_uInt32 a(0); a < nChildrenCount; a++)
{
createSubPrimitive3DVector(GetViewContact(a), aAllPrimitive3DContainer, nullptr, nullptr, false);
}
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 47b55fd16ffc..90403799d53a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -121,7 +121,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMediaObj::create
// and/or BoundRect
const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0);
const OUString& rURL(GetSdrMediaObj().getURL());
- const sal_uInt32 nPixelBorder(4L);
+ const sal_uInt32 nPixelBorder(4);
const drawinglayer::primitive2d::Primitive2DReference xRetval(
new drawinglayer::primitive2d::MediaPrimitive2D(
aTransform, rURL, aBackgroundColor, nPixelBorder,
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index a62241cc0f32..6cd40b3b56de 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -153,7 +153,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObj::createGlueP
std::vector< basegfx::B2DPoint > aGluepointVector;
// create GluePoint primitives. ATM these are relative to the SnapRect
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list