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

Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300 Reviewed-on: https://gerrit.libreoffice.org/41214 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-16 14:45:49 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-17 08:14:31 +0200
commit: ff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch)
tree: 272dfa9af5ead31b61c1be34afcaf4402ff4ad77
parent: 224b770fa77fe12ad5dc543ce020aca316b6558d (diff)
175 files changed, 474 insertions, 474 deletions
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++)
             {
                 const SdrGluePoint& rCandidate = (*pGluePointList)[(sal_uInt16)a];
                 const Point aPosition(rCandidate.GetAbsolutePos(GetSdrObject()));
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 83ae5011d5cc..1a57043194df 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -535,7 +535,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageHelplines
             const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0);
             xRetval.resize(nCount);
 
-            for(sal_uInt32 a(0L); a < nCount; a++)
+            for(sal_uInt32 a(0); a < nCount; a++)
             {
                 const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a];
                 const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y());
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index d04fdf41579f..1e47b53ddd7c 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -289,7 +289,7 @@ namespace drawinglayer
                 {
                     aStartPolyPolygon = basegfx::B2DPolyPolygon(static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue());
 
-                    if(aStartPolyPolygon.count() && aStartPolyPolygon.getB2DPolygon(0L).count())
+                    if(aStartPolyPolygon.count() && aStartPolyPolygon.getB2DPolygon(0).count())
                     {
                         bStartActive = true;
                         bStartCentered = static_cast<const XLineStartCenterItem&>(rSet.Get(XATTR_LINESTARTCENTER)).GetValue();
@@ -312,7 +312,7 @@ namespace drawinglayer
                 {
                     aEndPolyPolygon = basegfx::B2DPolyPolygon(static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue());
 
-                    if(aEndPolyPolygon.count() && aEndPolyPolygon.getB2DPolygon(0L).count())
+                    if(aEndPolyPolygon.count() && aEndPolyPolygon.getB2DPolygon(0).count())
                     {
                         bEndActive = true;
                         bEndCentered = static_cast<const XLineEndCenterItem&>(rSet.Get(XATTR_LINEENDCENTER)).GetValue();
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 54411079b657..a4d82ac87483 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -141,7 +141,7 @@ namespace drawinglayer
             maGraphicAttr(rGraphicAttr)
         {
             // reset some values from GraphicAttr which are part of transformation already
-            maGraphicAttr.SetRotation(0L);
+            maGraphicAttr.SetRotation(0);
         }
 
         bool SdrGrafPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 482af2ecdfb9..e419ea44b50f 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -144,7 +144,7 @@ namespace sdr
             }
 
             // also send the user calls
-            for(sal_uInt32 a(0L); a < nCount; a++)
+            for(sal_uInt32 a(0); a < nCount; a++)
             {
                 GetSdrObject().SendUserCall(SdrUserCallType::ChangeAttr, rChange.GetRectangle(a));
             }
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 1b7c7fca711a..706950690277 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -124,7 +124,7 @@ namespace sdr
                             // force ItemSet
                             GetObjectItemSet();
 
-                            SfxItemSet aNewSet(pOutliner->GetParaAttribs(0L));
+                            SfxItemSet aNewSet(pOutliner->GetParaAttribs(0));
                             mpItemSet->Put(aNewSet);
                         }
 
@@ -153,7 +153,7 @@ namespace sdr
             SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject());
 
             // #i25616#
-            sal_Int32 nOldLineWidth(0L);
+            sal_Int32 nOldLineWidth(0);
 
             if(XATTR_LINEWIDTH == nWhich && rObj.DoesSupportTextIndentingOnLineWidthChange())
             {
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 3cdd3c799231..c7548195cacc 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -155,7 +155,7 @@ bool PolyPolygonEditor::SetPointsSmooth( basegfx::B2VectorContinuity eFlags, con
 bool PolyPolygonEditor::GetRelativePolyPoint( const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum )
 {
     const sal_uInt32 nPolyCount(rPoly.count());
-    sal_uInt32 nPolyNum(0L);
+    sal_uInt32 nPolyNum(0);
 
     while(nPolyNum < nPolyCount)
     {
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index aca7985d4ebb..282734361225 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -236,7 +236,7 @@ namespace
             rOutDev.SetFillColor();
             rOutDev.SetLineColor(aColor);
 
-            for(sal_uInt32 a(0L); a < nLoopCount; a++)
+            for(sal_uInt32 a(0); a < nLoopCount; a++)
             {
                 const basegfx::B2DPoint aBStart(aCandidate.getB2DPoint(a));
                 const basegfx::B2DPoint aBEnd(aCandidate.getB2DPoint((a + 1) % aCandidate.count()));
@@ -252,7 +252,7 @@ namespace
         if(rPageView.GetPage() && rPageView.GetPage()->GetObjCount() >= 2L)
         {
             SdrPage* pPage = rPageView.GetPage();
-            SdrObject* pObjA = pPage->GetObj(0L);
+            SdrObject* pObjA = pPage->GetObj(0);
 
             if(pObjA && dynamic_cast<const SdrPathObj*>( pObjA) !=  nullptr)
             {
@@ -261,7 +261,7 @@ namespace
 
                 basegfx::B2DPolyPolygon aPolyB;
 
-                for(sal_uInt32 a(1L); a < rPageView.GetPage()->GetObjCount(); a++)
+                for(sal_uInt32 a(1); a < rPageView.GetPage()->GetObjCount(); a++)
                 {
                     SdrObject* pObjB = pPage->GetObj(a);
 
@@ -279,7 +279,7 @@ namespace
                     // poly b being closed.
                     basegfx::B2DPolyPolygon aResult(basegfx::tools::clipPolyPolygonOnPolyPolygon(aPolyB, aPolyA));
 
-                    for(sal_uInt32 a(0L); a < aResult.count(); a++)
+                    for(sal_uInt32 a(0); a < aResult.count(); a++)
                     {
                         int nR = comphelper::rng::uniform_int_distribution(0, 254);
                         int nG = comphelper::rng::uniform_int_distribution(0, 254);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 35898436490e..8326e0bbc483 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -113,7 +113,7 @@ SdrItemPool::SdrItemPool(
 {
     // prepare some constants
     const Color aNullCol(RGB_Color(COL_BLACK));
-    const sal_Int32 nDefEdgeDist(500L); // Defaulting hard for Draw (100TH_MM) currently. MapMode will have to be taken into account in the future.
+    const sal_Int32 nDefEdgeDist(500); // Defaulting hard for Draw (100TH_MM) currently. MapMode will have to be taken into account in the future.
 
     // init the non-persistent items
     for(sal_uInt16 i(SDRATTR_NOTPERSIST_FIRST); i <= SDRATTR_NOTPERSIST_LAST; i++)
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 0e3aed9a2813..c23a2b54672b 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -66,7 +66,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
 {
     basegfx::B2DPolyPolygon aB2DPolyPolygon(rObject.TakeXorPoly());
 
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
@@ -134,7 +134,7 @@ ImpSdrCreateViewExtraData::~ImpSdrCreateViewExtraData()
 
 void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView, const SdrObject* pObject, const basegfx::B2DPolyPolygon& rPolyPoly)
 {
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = pCandidate->GetOverlayManager();
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index e2aefc9b2104..9a99fa1d8b04 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1152,7 +1152,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
         // #i38135#
         if(bResetAnimationTimer)
         {
-            SetAnimationTimer(0L);
+            SetAnimationTimer(0);
         }
 
         // better check before what to do:
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 9c7193c7a55a..e7b8a3f586f9 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -686,19 +686,19 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
 {
     const sal_uInt32 nPolyCount(rPolyPolygon.count());
 
-    if(0L == nPolyCount)
+    if(0 == nPolyCount)
     {
         return basegfx::B2DPolygon();
     }
-    else if(1L == nPolyCount)
+    else if(1 == nPolyCount)
     {
-        return rPolyPolygon.getB2DPolygon(0L);
+        return rPolyPolygon.getB2DPolygon(0);
     }
     else
     {
-        basegfx::B2DPolygon aRetval(rPolyPolygon.getB2DPolygon(0L));
+        basegfx::B2DPolygon aRetval(rPolyPolygon.getB2DPolygon(0));
 
-        for(sal_uInt32 a(1L); a < nPolyCount; a++)
+        for(sal_uInt32 a(1); a < nPolyCount; a++)
         {
             basegfx::B2DPolygon aCandidate(rPolyPolygon.getB2DPolygon(a));
 
@@ -706,9 +706,9 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
             {
                 if(aCandidate.count())
                 {
-                    const basegfx::B2DPoint aCA(aCandidate.getB2DPoint(0L));
+                    const basegfx::B2DPoint aCA(aCandidate.getB2DPoint(0));
                     const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1L));
-                    const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0L));
+                    const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0));
                     const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1L));
 
                     const double fRACA(basegfx::B2DVector(aCA - aRA).getLength());
@@ -1327,7 +1327,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
         else
         {
             // check for Polyline
-            const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(0L));
+            const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(0));
             const sal_uInt32 nPointCount(aPolygon.count());
 
             if(nPointCount <= 2L)
@@ -1338,7 +1338,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
             {
                 if(!aPolygon.isClosed())
                 {
-                    const basegfx::B2DPoint aPointA(aPolygon.getB2DPoint(0L));
+                    const basegfx::B2DPoint aPointA(aPolygon.getB2DPoint(0));
                     const basegfx::B2DPoint aPointB(aPolygon.getB2DPoint(nPointCount - 1L));
                     const double fDistance(basegfx::B2DVector(aPointB - aPointA).getLength());
                     const double fJoinTolerance(10.0);
@@ -1412,7 +1412,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon,
     else if(bMakeLines && 1L == nPolygonCount)
     {
         // #i69172# ..or with at least 2 edges (curves or lines)
-        const basegfx::B2DPolygon aPolygon(rPpolyPolygon.getB2DPolygon(0L));
+        const basegfx::B2DPolygon aPolygon(rPpolyPolygon.getB2DPolygon(0));
         const sal_uInt32 nPointCount(aPolygon.count());
 
         if(nPointCount > 2L)
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 2d1061f1a1fe..7ea0e0b686ba 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -301,17 +301,17 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 
             if(pAccess && nWidth > 0 && nHeight > 0)
             {
-                sal_uInt32 nRt(0L);
-                sal_uInt32 nGn(0L);
-                sal_uInt32 nBl(0L);
-                const sal_uInt32 nMaxSteps(8L);
-                const sal_uInt32 nXStep((nWidth > nMaxSteps) ? nWidth / nMaxSteps : 1L);
-                const sal_uInt32 nYStep((nHeight > nMaxSteps) ? nHeight / nMaxSteps : 1L);
-                sal_uInt32 nCount(0L);
-
-                for(sal_uInt32 nY(0L); nY < nHeight; nY += nYStep)
+                sal_uInt32 nRt(0);
+                sal_uInt32 nGn(0);
+                sal_uInt32 nBl(0);
+                const sal_uInt32 nMaxSteps(8);
+                const sal_uInt32 nXStep((nWidth > nMaxSteps) ? nWidth / nMaxSteps : 1);
+                const sal_uInt32 nYStep((nHeight > nMaxSteps) ? nHeight / nMaxSteps : 1);
+                sal_uInt32 nCount(0);
+
+                for(sal_uInt32 nY(0); nY < nHeight; nY += nYStep)
                 {
-                    for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
+                    for(sal_uInt32 nX(0); nX < nWidth; nX += nXStep)
                     {
                         const BitmapColor& rCol2 = pAccess->GetColor(nY, nX);
 
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 0837835642b0..5b495583ec1c 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -778,7 +778,7 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc
             if(1L == pLastPoly->GetPathPoly().count())
             {
                 bool bOk(false);
-                basegfx::B2DPolygon aDstPoly(pLastPoly->GetPathPoly().getB2DPolygon(0L));
+                basegfx::B2DPolygon aDstPoly(pLastPoly->GetPathPoly().getB2DPolygon(0));
 
                 // #i102706# Do not merge closed polygons
                 if(aDstPoly.isClosed())
@@ -791,19 +791,19 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc
                     const sal_uInt32 nMaxDstPnt(aDstPoly.count() - 1L);
                     const sal_uInt32 nMaxSrcPnt(rSrcPoly.count() - 1L);
 
-                    if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(0L))
+                    if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(0))
                     {
                         aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L);
                         bOk = true;
                     }
-                    else if(aDstPoly.getB2DPoint(0L) == rSrcPoly.getB2DPoint(nMaxSrcPnt))
+                    else if(aDstPoly.getB2DPoint(0) == rSrcPoly.getB2DPoint(nMaxSrcPnt))
                     {
                         basegfx::B2DPolygon aNew(rSrcPoly);
                         aNew.append(aDstPoly, 1L, aDstPoly.count() - 1L);
                         aDstPoly = aNew;
                         bOk = true;
                     }
-                    else if(aDstPoly.getB2DPoint(0L) == rSrcPoly.getB2DPoint(0L))
+                    else if(aDstPoly.getB2DPoint(0) == rSrcPoly.getB2DPoint(0))
                     {
                         aDstPoly.flip();
                         aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L);
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index f67f22b00d3d..b899f1d905fc 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -538,7 +538,7 @@ void SdrHdl::CreateB2dIAObject()
 
         if(pPageView)
         {
-            for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+            for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
             {
                 // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
                 const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
@@ -1105,7 +1105,7 @@ void SdrHdlColor::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);
 
@@ -1260,7 +1260,7 @@ void SdrHdlGradient::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);
 
@@ -1418,7 +1418,7 @@ void SdrHdlLine::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);
 
@@ -1474,7 +1474,7 @@ void SdrHdlBezWgt::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);
 
@@ -1530,7 +1530,7 @@ void E3dVolumeMarker::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);
 
@@ -1708,7 +1708,7 @@ void ImpMeasureHdl::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);
 
@@ -1770,7 +1770,7 @@ void ImpTextframeHdl::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);
 
@@ -2362,7 +2362,7 @@ void SdrCropHdl::CreateB2dIAObject()
         const BitmapEx aHandlesBitmap(SIP_SA_CROP_MARKERS);
         BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
 
-        for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+        for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
         {
             const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
 
@@ -2612,7 +2612,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
 
     const drawinglayer::primitive2d::Primitive2DContainer aSequence { aTransparenceMaskedGraphic };
 
-    for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+    for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
     {
         // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
         const SdrPageWindow& rPageWindow = *(pPageView->GetPageWindow(b));
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 81792c7ab586..270e95242182 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1064,7 +1064,7 @@ vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView const & rView)
 {
     const sal_uInt32 nWinCount(rView.PaintWindowCount());
 
-    for(sal_uInt32 a(0L); a < nWinCount; a++)
+    for(sal_uInt32 a(0); a < nWinCount; a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
 
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index a8e56773ff8c..39a1b2c19d39 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -25,7 +25,7 @@
 #include <svx/scene3d.hxx>
 
 SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, bool bReverse)
-:   mnIndex(0L),
+:   mnIndex(0),
     mbReverse(bReverse)
 {
     ImpProcessObjectList(rObjList, eMode, true);
@@ -33,7 +33,7 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, bo
 }
 
 SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode)
-:   mnIndex(0L),
+:   mnIndex(0),
     mbReverse(false)
 {
     ImpProcessObjectList(rObjList, eMode, bUseZOrder);
@@ -41,7 +41,7 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrI
 }
 
 SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode )
-:   mnIndex(0L),
+:   mnIndex(0),
     mbReverse(false)
 {
     if ( dynamic_cast<const SdrObjGroup*>(&rObj) !=  nullptr )
@@ -52,7 +52,7 @@ SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode )
 }
 
 SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode )
-:   mnIndex(0L),
+:   mnIndex(0),
     mbReverse(false)
 {
     ImpProcessMarkList(rMarkList, eMode);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index e972dd7c7ceb..4e287e80de07 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -86,7 +86,7 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
 :   maSecondPosition(rStartPos),
     mbUnmarking(bUnmarking)
 {
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
@@ -106,7 +106,7 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
     if(rNewPosition != maSecondPosition)
     {
         // apply to OverlayObjects
-        for(sal_uInt32 a(0L); a < maObjects.count(); a++)
+        for(sal_uInt32 a(0); a < maObjects.count(); a++)
         {
             sdr::overlay::OverlayRollingRectangleStriped& rCandidate = static_cast< sdr::overlay::OverlayRollingRectangleStriped&>(maObjects.getOverlayObject(a));
             rCandidate.setSecondPosition(rNewPosition);
@@ -629,7 +629,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
     // remember old focus handle values to search for it again
     const SdrHdl* pSaveOldFocusHdl = maHdlList.GetFocusHdl();
     bool bSaveOldFocus(false);
-    sal_uInt32 nSavePolyNum(0L), nSavePointNum(0L);
+    sal_uInt32 nSavePolyNum(0), nSavePointNum(0);
     SdrHdlKind eSaveKind(SdrHdlKind::Move);
     SdrObject* pSaveObj = nullptr;
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 7be40f5f0894..532337571d05 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -281,8 +281,8 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
 
         // no shadow
         aTempSet.Put(makeSdrShadowItem(false));
-        aTempSet.Put(makeSdrShadowXDistItem(0L));
-        aTempSet.Put(makeSdrShadowYDistItem(0L));
+        aTempSet.Put(makeSdrShadowXDistItem(0));
+        aTempSet.Put(makeSdrShadowYDistItem(0));
 
         // line color and transparency like shadow
         if(bLineUsed)
@@ -358,9 +358,9 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
 
                     if(pWriteAccess)
                     {
-                        for(long y(0L); y < pReadAccess->Height(); y++)
+                        for(long y(0); y < pReadAccess->Height(); y++)
                         {
-                            for(long x(0L); x < pReadAccess->Width(); x++)
+                            for(long x(0); x < pReadAccess->Width(); x++)
                             {
                                 sal_uInt16 nLuminance((sal_uInt16)pReadAccess->GetLuminance(y, x) + 1);
                                 const BitmapColor aDestColor(
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index a21af0f7f328..301bda34127a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2387,7 +2387,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                 aLinePolygonPart->SetModel(pRet->GetModel());
 
                 // correct item properties
-                aSet.Put(XLineWidthItem(0L));
+                aSet.Put(XLineWidthItem(0));
                 aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
                 Color aColorLine = static_cast<const XLineColorItem&>(aSet.Get(XATTR_LINECOLOR)).GetColorValue();
                 sal_uInt16 nTransLine = static_cast<const XLineTransparenceItem&>(aSet.Get(XATTR_LINETRANSPARENCE)).GetValue();
@@ -2407,7 +2407,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                 aLineHairlinePart = new SdrPathObj(OBJ_PATHLINE, aMergedHairlinePolyPolygon);
                 aLineHairlinePart->SetModel(pRet->GetModel());
 
-                aSet.Put(XLineWidthItem(0L));
+                aSet.Put(XLineWidthItem(0));
                 aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
                 aSet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
 
@@ -2447,7 +2447,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
                     aSet.ClearItem();
                     aSet.Put(pRet->GetMergedItemSet());
                     aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
-                    aSet.Put(XLineWidthItem(0L));
+                    aSet.Put(XLineWidthItem(0));
 
                     SdrObject* pClone = pRet->Clone();
 
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 71ce32a660f3..2f5ae204d3d0 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -289,7 +289,7 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const
         if(nPntNum < aTailPoly.GetSize())
         {
             SdrHdl* pHdl = new SdrHdl(aTailPoly.GetPoint((sal_uInt16)nPntNum), SdrHdlKind::Poly);
-            pHdl->SetPolyNum(1L);
+            pHdl->SetPolyNum(1);
             pHdl->SetPointNum(nPntNum);
             return pHdl;
         }
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index dcf8345e2cf7..957e03c3f473 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1155,8 +1155,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
         pPath->SetMergedItemSet(aSet);
         pPath->SetStyleSheet(pStyleSheet, true);
         pGroup->GetSubList()->NbcInsertObject(pPath);
-        aSet.Put(XLineStartWidthItem(0L));
-        aSet.Put(XLineEndWidthItem(0L));
+        aSet.Put(XLineStartWidthItem(0));
+        aSet.Put(XLineEndWidthItem(0));
         nLoopStart = 1;
     }
     else if(nCount == 4)
@@ -1164,7 +1164,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
         // four lines, middle line with gap, so there are two lines used
         // which have one arrow each
         sal_Int32 nEndWidth = static_cast<const XLineEndWidthItem&>(aSet.Get(XATTR_LINEENDWIDTH)).GetValue();
-        aSet.Put(XLineEndWidthItem(0L));
+        aSet.Put(XLineEndWidthItem(0));
 
         aPolyPoly.clear();
         aPolyPoly.append(aTmpPolyPolygon[0].getB2DPolygon());
@@ -1176,7 +1176,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
         pGroup->GetSubList()->NbcInsertObject(pPath);
 
         aSet.Put(XLineEndWidthItem(nEndWidth));
-        aSet.Put(XLineStartWidthItem(0L));
+        aSet.Put(XLineStartWidthItem(0));
 
         aPolyPoly.clear();
         aPolyPoly.append(aTmpPolyPolygon[1].getB2DPolygon());
@@ -1187,7 +1187,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
 
         pGroup->GetSubList()->NbcInsertObject(pPath);
 
-        aSet.Put(XLineEndWidthItem(0L));
+        aSet.Put(XLineEndWidthItem(0));
         nLoopStart = 2;
     }
     else if(nCount == 5)
@@ -1195,7 +1195,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
         // five lines, first two are the outer ones
         sal_Int32 nEndWidth = static_cast<const XLineEndWidthItem&>(aSet.Get(XATTR_LINEENDWIDTH)).GetValue();
 
-        aSet.Put(XLineEndWidthItem(0L));
+        aSet.Put(XLineEndWidthItem(0));
 
         aPolyPoly.clear();
         aPolyPoly.append(aTmpPolyPolygon[0].getB2DPolygon());
@@ -1207,7 +1207,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
         pGroup->GetSubList()->NbcInsertObject(pPath);
 
         aSet.Put(XLineEndWidthItem(nEndWidth));
-        aSet.Put(XLineStartWidthItem(0L));
+        aSet.Put(XLineStartWidthItem(0));
 
         aPolyPoly.clear();
         aPolyPoly.append(aTmpPolyPolygon[1].getB2DPolygon());
@@ -1218,7 +1218,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
 
         pGroup->GetSubList()->NbcInsertObject(pPath);
 
-        aSet.Put(XLineEndWidthItem(0L));
+        aSet.Put(XLineEndWidthItem(0));
         nLoopStart = 2;
     }
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 2f8b98ba915a..2150d636f922 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1823,7 +1823,7 @@ void SdrOle2Obj::GetObjRef_Impl()
                 ClearGraphic();
 
                 // if status was not set before, force it back
-                // to not set, so that SetGraphic(0L) above does not
+                // to not set, so that SetGraphic(0) above does not
                 // set the modified state of the model.
                 if(!bWasChanged && pModel && pModel->IsChanged())
                 {
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 9b6083e67764..513adcf0b8ca 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1681,7 +1681,7 @@ SdrPathObj::~SdrPathObj()
 
 static bool lcl_ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
 {
-    return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0L).count());
+    return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0).count());
 }
 
 static tools::Rectangle lcl_ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon)
@@ -1697,9 +1697,9 @@ void SdrPathObj::ImpForceLineAngle()
 {
     if(OBJ_LINE == meKind && lcl_ImpIsLine(GetPathPoly()))
     {
-        const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
-        const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
-        const basegfx::B2DPoint aB2DPoint1(aPoly.getB2DPoint(1L));
+        const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0));
+        const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0));
+        const basegfx::B2DPoint aB2DPoint1(aPoly.getB2DPoint(1));
         const Point aPoint0(FRound(aB2DPoint0.getX()), FRound(aB2DPoint0.getY()));
         const Point aPoint1(FRound(aB2DPoint1.getX()), FRound(aB2DPoint1.getY()));
         const Point aDelt(aPoint1 - aPoint0);
@@ -1880,9 +1880,9 @@ OUString SdrPathObj::TakeObjNameSingul() const
 
         if(lcl_ImpIsLine(GetPathPoly()))
         {
-            const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
-            const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
-            const basegfx::B2DPoint aB2DPoint1(aPoly.getB2DPoint(1L));
+            const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0));
+            const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0));
+            const basegfx::B2DPoint aB2DPoint1(aPoly.getB2DPoint(1));
 
             if(aB2DPoint0 != aB2DPoint1)
             {
@@ -1930,10 +1930,10 @@ OUString SdrPathObj::TakeObjNameSingul() const
         else
         {
             // get point count
-            sal_uInt32 nPointCount(0L);
+            sal_uInt32 nPointCount(0);
             const sal_uInt32 nPolyCount(GetPathPoly().count());
 
-            for(sal_uInt32 a(0L); a < nPolyCount; a++)
+            for(sal_uInt32 a(0); a < nPolyCount; a++)
             {
                 nPointCount += GetPathPoly().getB2DPolygon(a).count();
             }
@@ -2004,10 +2004,10 @@ basegfx::B2DPolyPolygon SdrPathObj::TakeXorPoly() const
 
 sal_uInt32 SdrPathObj::GetHdlCount() const
 {
-    sal_uInt32 nRetval(0L);
+    sal_uInt32 nRetval(0);
     const sal_uInt32 nPolyCount(GetPathPoly().count());
 
-    for(sal_uInt32 a(0L); a < nPolyCount; a++)
+    for(sal_uInt32 a(0); a < nPolyCount; a++)
     {
         nRetval += GetPathPoly().getB2DPolygon(a).count();
     }
@@ -2477,9 +2477,9 @@ bool SdrPathObj::IsPolyObj() const
 sal_uInt32 SdrPathObj::GetPointCount() const
 {
     const sal_uInt32 nPolyCount(GetPathPoly().count());
-    sal_uInt32 nRetval(0L);
+    sal_uInt32 nRetval(0);
 
-    for(sal_uInt32 a(0L); a < nPolyCount; a++)
+    for(sal_uInt32 a(0); a < nPolyCount; a++)
     {
         nRetval += GetPathPoly().getB2DPolygon(a).count();
     }
@@ -2541,8 +2541,8 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
     {
         // look for smallest distance data
         const basegfx::B2DPoint aTestPoint(rPos.X(), rPos.Y());
-        sal_uInt32 nSmallestPolyIndex(0L);
-        sal_uInt32 nSmallestEdgeIndex(0L);
+        sal_uInt32 nSmallestPolyIndex(0);
+        sal_uInt32 nSmallestEdgeIndex(0);
         double fSmallestCut;
         basegfx::tools::getSmallestDistancePointToPolyPolygon(GetPathPoly(), aTestPoint, nSmallestPolyIndex, nSmallestEdgeIndex, fSmallestCut);
 
@@ -2571,8 +2571,8 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj)
     {
         // look for smallest distance data
         const basegfx::B2DPoint aTestPoint(rPos.X(), rPos.Y());
-        sal_uInt32 nSmallestPolyIndex(0L);
-        sal_uInt32 nSmallestEdgeIndex(0L);
+        sal_uInt32 nSmallestPolyIndex(0);
+        sal_uInt32 nSmallestEdgeIndex(0);
         double fSmallestCut;
         basegfx::tools::getSmallestDistancePointToPolyPolygon(GetPathPoly(), aTestPoint, nSmallestPolyIndex, nSmallestEdgeIndex, fSmallestCut);
         basegfx::B2DPolygon aCandidate(GetPathPoly().getB2DPolygon(nSmallestPolyIndex));
@@ -2658,7 +2658,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj)
         maPathPolygon.setB2DPolygon(nSmallestPolyIndex, aCandidate);
 
         // create old polygon index from it
-        for(sal_uInt32 a(0L); a < nSmallestPolyIndex; a++)
+        for(sal_uInt32 a(0); a < nSmallestPolyIndex; a++)
         {
             nNewHdl += GetPathPoly().getB2DPolygon(a).count();
         }
@@ -2857,7 +2857,7 @@ bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP
         if(OBJ_LINE == meKind)
         {
             // ignore shear and rotate, just use scale and translate
-            OSL_ENSURE(GetPathPoly().count() > 0L && GetPathPoly().getB2DPolygon(0L).count() > 1L, "OBJ_LINE with too few polygons (!)");
+            OSL_ENSURE(GetPathPoly().count() > 0L && GetPathPoly().getB2DPolygon(0).count() > 1L, "OBJ_LINE with too few polygons (!)");
             // #i72287# use polygon without control points for range calculation. Do not change rPolyPolygon
             // itself, else this method will no longer return the full polygon information (curve will
             // be lost)
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 76ff4f398612..c956d9206512 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -67,7 +67,7 @@ namespace
         const sal_Int32 nCount(rPrimitiveVector.size());
         drawinglayer::primitive2d::Primitive2DContainer aRetval(nCount);
 
-        for(sal_Int32 a(0L); a < nCount; a++)
+        for(sal_Int32 a(0); a < nCount; a++)
         {
             aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(rPrimitiveVector[a]);
         }
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 9ee2fdfeb1ed..b05cc0328b7d 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -234,7 +234,7 @@ namespace
 
             if(mxBreak.is())
             {
-                sal_Int32 nDone(0L);
+                sal_Int32 nDone(0);
                 nNextGlyphLen = mxBreak->nextCharacters(pCandidate->getText(), nPosition,
                     rFontLocale, CharacterIteratorMode::SKIPCELL, 1, nDone) - nPosition;
             }
@@ -573,7 +573,7 @@ namespace
             basegfx::B2DPolyPolygon aB2DPolyPolygon = *aPolygon;
             aB2DPolyPolygon.transform(rTransform);
 
-            for(sal_uInt32 a(0L); a < aB2DPolyPolygon.count(); a++)
+            for(sal_uInt32 a(0); a < aB2DPolyPolygon.count(); a++)
             {
                 // create one primitive per polygon
                 drawinglayer::primitive2d::PolygonStrokePrimitive2D* pNew =
@@ -621,7 +621,7 @@ namespace
                             // create UnifiedTransparencePrimitive2D
                             drawinglayer::primitive2d::Primitive2DContainer aStrokePrimitiveSequence(nStrokeCount);
 
-                            for(sal_uInt32 b(0L); b < nStrokeCount; b++)
+                            for(sal_uInt32 b(0); b < nStrokeCount; b++)
                             {
                                 aStrokePrimitiveSequence[b] = drawinglayer::primitive2d::Primitive2DReference(aStrokePrimitives[b]);
                             }
@@ -648,7 +648,7 @@ namespace
         {
             drawinglayer::primitive2d::Primitive2DContainer aRetval(nNewCount);
 
-            for(sal_uInt32 a(0L); a < nNewCount; a++)
+            for(sal_uInt32 a(0); a < nNewCount; a++)
             {
                 aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(aNewPrimitives[a]);
             }
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index cb4fd10a91e3..3ea2aee6bf20 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1159,16 +1159,16 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet)
 SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
 :   SdrObjList(&rNewModel, this),
     mpViewContact(nullptr),
-    mnWidth(10L),
-    mnHeight(10L),
-    mnBorderLeft(0L),
-    mnBorderUpper(0L),
-    mnBorderRight(0L),
-    mnBorderLower(0L),
+    mnWidth(10),
+    mnHeight(10),
+    mnBorderLeft(0),
+    mnBorderUpper(0),
+    mnBorderRight(0),
+    mnBorderLower(0),
     mpLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())),
     mpSdrPageProperties(nullptr),
     mpMasterPageDescriptor(nullptr),
-    nPageNum(0L),
+    nPageNum(0),
     mbMaster(bMasterPage),
     mbInserted(false),
     mbObjectsNotPersistent(false),
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0291abada558..cc18ee4888cf 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -154,7 +154,7 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
     pAktGroup = nullptr;
     SetAktGroupAndList(nullptr, mpPage);
 
-    for(sal_uInt32 a(0L); a < rNewView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rNewView.PaintWindowCount(); a++)
     {
         AddPaintWindowToPageView(*rNewView.GetPaintWindow(a));
     }
@@ -213,7 +213,7 @@ void SdrPageView::Show()
     {
         mbVisible = true;
 
-        for(sal_uInt32 a(0L); a < GetView().PaintWindowCount(); a++)
+        for(sal_uInt32 a(0); a < GetView().PaintWindowCount(); a++)
         {
             AddPaintWindowToPageView(*GetView().GetPaintWindow(a));
         }
@@ -369,7 +369,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget,
                     // paints into an unknown device other than the view was created for (e.g. VirtualDevice)
                     if(PageWindowCount())
                     {
-                        SdrPageWindow* pExistingPageWindow = GetPageWindow(0L);
+                        SdrPageWindow* pExistingPageWindow = GetPageWindow(0);
                         SdrPaintWindow& rExistingPaintWindow = pExistingPageWindow->GetPaintWindow();
                         const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion();
                         aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
@@ -382,7 +382,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget,
         else
         {
             // paint in all known windows
-            for(sal_uInt32 a(0L); a < PageWindowCount(); a++)
+            for(sal_uInt32 a(0); a < PageWindowCount(); a++)
             {
                 SdrPageWindow* pTarget = GetPageWindow(a);
                 pTarget->RedrawLayer(&nID, pRedirector, nullptr);
@@ -692,7 +692,7 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
     if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) {
         const SdrHelpLine& rHL=aHelpLines[nNum];
 
-        for(sal_uInt32 a(0L); a < GetView().PaintWindowCount(); a++)
+        for(sal_uInt32 a(0); a < GetView().PaintWindowCount(); a++)
         {
             SdrPaintWindow* pCandidate = GetView().GetPaintWindow(a);
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 4ac29efb0e08..4d3dc758baaf 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -542,10 +542,10 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
 #define REMEMBERED_TIMES_COUNT  (10)
     static bool bDoTimerTest(false);
     static bool bTimesInited(false);
-    static sal_uInt32 nRepeatCount(10L);
+    static sal_uInt32 nRepeatCount(10);
     static double fLastTimes[REMEMBERED_TIMES_COUNT];
     const sal_uInt64 nStartTime(tools::Time::GetSystemTicks());
-    sal_uInt32 count(1L);
+    sal_uInt32 count(1);
     sal_uInt32 a;
 
     if(bDoTimerTest)
@@ -876,7 +876,7 @@ void SdrPaintView::GlueInvalidate() const
 {
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
-    for(sal_uInt32 nWinNum(0L); nWinNum < nWindowCount; nWinNum++)
+    for(sal_uInt32 nWinNum(0); nWinNum < nWindowCount; nWinNum++)
     {
         SdrPaintWindow* pPaintWindow = GetPaintWindow(nWinNum);
 
@@ -904,7 +904,7 @@ void SdrPaintView::InvalidateAllWin()
 {
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
-    for(sal_uInt32 a(0L); a < nWindowCount; a++)
+    for(sal_uInt32 a(0); a < nWindowCount; a++)
     {
         SdrPaintWindow* pPaintWindow = GetPaintWindow(a);
 
@@ -919,7 +919,7 @@ void SdrPaintView::InvalidateAllWin(const tools::Rectangle& rRect)
 {
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
-    for(sal_uInt32 a(0L); a < nWindowCount; a++)
+    for(sal_uInt32 a(0); a < nWindowCount; a++)
     {
         SdrPaintWindow* pPaintWindow = GetPaintWindow(a);
 
@@ -1195,7 +1195,7 @@ void SdrPaintView::SetAnimationPause( bool bSet )
 
         if(mpPageView)
         {
-            for(sal_uInt32 b(0L); b < mpPageView->PageWindowCount(); b++)
+            for(sal_uInt32 b(0); b < mpPageView->PageWindowCount(); b++)
             {
                 SdrPageWindow& rPageWindow = *(mpPageView->GetPageWindow(b));
                 sdr::contact::ObjectContact& rObjectContact = rPageWindow.GetObjectContact();
@@ -1307,7 +1307,7 @@ void SdrPaintView::SetAnimationTimer(sal_uInt32 nTime)
     if(mpPageView)
     {
         // first, reset all timers at all windows to 0L
-        for(sal_uInt32 a(0L); a < mpPageView->PageWindowCount(); a++)
+        for(sal_uInt32 a(0); a < mpPageView->PageWindowCount(); a++)
         {
             SdrPageWindow& rPageWindow = *mpPageView->GetPageWindow(a);
             sdr::contact::ObjectContact& rObjectContact = rPageWindow.GetObjectContact();
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index a201188e19f1..da75f33b83c9 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -365,7 +365,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
 
             for(SdrUShortCont::const_reverse_iterator it = rPts.rbegin(); it != rPts.rend(); ++it)
             {
-                sal_uInt32 nNewPt0Idx(0L);
+                sal_uInt32 nNewPt0Idx(0);
                 SdrObject* pNewObj = pObj->RipPoint(*it, nNewPt0Idx);
 
                 if(pNewObj)
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 4fb3affa15bc..302009ade96e 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -55,7 +55,7 @@ public:
 ImplPageOriginOverlay::ImplPageOriginOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos)
 :   maPosition(rStartPos)
 {
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
@@ -129,7 +129,7 @@ ImplHelpLineOverlay::ImplHelpLineOverlay(
     mnHelpLineNumber(nHelpLineNumber),
     meHelpLineKind(eKind)
 {
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
@@ -337,7 +337,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
                 if (bOPntSnap && nMaxPointSnapCount>0)
                 {
                     sal_uInt32 nCount(pO->GetSnapPointCount());
-                    for (sal_uInt32 i(0L); i < nCount && nMaxPointSnapCount > 0L; i++)
+                    for (sal_uInt32 i(0); i < nCount && nMaxPointSnapCount > 0L; i++)
                     {
                         Point aP(pO->GetSnapPoint(i));
                         dx1=x-aP.X();
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 2ec9a93fef13..02087710a195 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -88,7 +88,7 @@ void SdrDropMarkerOverlay::ImplCreateOverlays(
     const SdrView& rView,
     const basegfx::B2DPolyPolygon& rLinePolyPolygon)
 {
-    for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
+    for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
         rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
@@ -1450,7 +1450,7 @@ void SdrView::SetMasterPagePaintCaching(bool bOn)
 
         if(pPageView)
         {
-            for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+            for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
             {
                 SdrPageWindow* pPageWindow = pPageView->GetPageWindow(b);
                 assert(pPageWindow && "SdrView::SetMasterPagePaintCaching: Corrupt SdrPageWindow list (!)");
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 0d954f6e799c..d347a7e1a7da 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -208,7 +208,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, sal_uInt16 eFormat, const Point& r
 
         if(1L == rOutliner.GetParagraphCount())
         {
-            SfxStyleSheet* pCandidate = rOutliner.GetStyleSheet(0L);
+            SfxStyleSheet* pCandidate = rOutliner.GetStyleSheet(0);
 
             if(pCandidate)
             {
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 697b85222265..45508802c0d7 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -277,7 +277,7 @@ namespace sdr
                             // force ItemSet
                             GetObjectItemSet();
 
-                            SfxItemSet aNewSet(pOutliner->GetParaAttribs(0L));
+                            SfxItemSet aNewSet(pOutliner->GetParaAttribs(0));
                             mpItemSet->Put(aNewSet);
                         }
 
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index f5557b5faaa6..0522b5d927da 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -203,7 +203,7 @@ static vcl::Window* ImpGetViewWin(SdrView const * pView)
     if( pView )
     {
         const sal_uInt32 nCount(pView->PaintWindowCount());
-        for(sal_uInt32 nNum(0L); nNum < nCount; nNum++)
+        for(sal_uInt32 nNum(0); nNum < nCount; nNum++)
         {
             OutputDevice* pOut = &(pView->GetPaintWindow(nNum)->GetOutputDevice());
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 92e30d930efc..409265aad00c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1044,7 +1044,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
     // get pointer to external arrays
     drawing::PointSequence* pOuterSequence = rRetval.getArray();
 
-    for(sal_uInt32 a(0L); a < rPolyPoly.count(); a++)
+    for(sal_uInt32 a(0); a < rPolyPoly.count(); a++)
     {
         // get single polygon
         const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(a));
@@ -1061,7 +1061,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
         // get pointer to arrays
         awt::Point* pInnerSequence = pOuterSequence->getArray();
 
-        for(sal_uInt32 b(0L); b < nPointCount; b++)
+        for(sal_uInt32 b(0); b < nPointCount; b++)
         {
             const basegfx::B2DPoint aPoint(aPoly.getB2DPoint(b));
             *pInnerSequence = awt::Point( basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY()) );
@@ -1116,14 +1116,14 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
 
         sal_Int32 nCount = 0;
         if( rPolyPoly.count() > 0 )
-            nCount = rPolyPoly.getB2DPolygon(0L).count();
+            nCount = rPolyPoly.getB2DPolygon(0).count();
 
         drawing::PointSequence aRetval( nCount );
 
         if( nCount > 0 )
         {
             // get single polygon
-            const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(0L));
+            const basegfx::B2DPolygon aPoly(rPolyPoly.getB2DPolygon(0));
 
             // get pointer to arrays
             awt::Point* pSequence = aRetval.getArray();
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 293b77c1a2bc..db8a29d4a08c 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -371,7 +371,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
 
             // set object transformations again at objects
             aIter.Reset();
-            sal_uInt32 nIndex(0L);
+            sal_uInt32 nIndex(0);
             while(aIter.IsMore())
             {
                 E3dObject* p3DObj = static_cast<E3dObject*>(aIter.Next());
@@ -699,7 +699,7 @@ bool PolyPolygonShape3D_to_B3dPolyPolygon(
     drawing::DoubleSequence* pInnerSequenceX = aSourcePolyPolygon.SequenceX.getArray();
     drawing::DoubleSequence* pInnerSequenceY = aSourcePolyPolygon.SequenceY.getArray();
     drawing::DoubleSequence* pInnerSequenceZ = aSourcePolyPolygon.SequenceZ.getArray();
-    for(sal_Int32 a(0L);a<nOuterSequenceCount;a++)
+    for(sal_Int32 a(0);a<nOuterSequenceCount;a++)
     {
         sal_Int32 nInnerSequenceCount = pInnerSequenceX->getLength();
         if(nInnerSequenceCount != pInnerSequenceY->getLength() || nInnerSequenceCount != pInnerSequenceZ->getLength())
@@ -710,7 +710,7 @@ bool PolyPolygonShape3D_to_B3dPolyPolygon(
         double* pArrayX = pInnerSequenceX->getArray();
         double* pArrayY = pInnerSequenceY->getArray();
         double* pArrayZ = pInnerSequenceZ->getArray();
-        for(sal_Int32 b(0L);b<nInnerSequenceCount;b++)
+        for(sal_Int32 b(0);b<nInnerSequenceCount;b++)
         {
             aNewPolygon.append(basegfx::B3DPoint(*pArrayX++,*pArrayY++,*pArrayZ++));
         }
@@ -739,7 +739,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
     drawing::DoubleSequence* pOuterSequenceX = aRetval.SequenceX.getArray();
     drawing::DoubleSequence* pOuterSequenceY = aRetval.SequenceY.getArray();
     drawing::DoubleSequence* pOuterSequenceZ = aRetval.SequenceZ.getArray();
-    for(sal_uInt32 a(0L);a<rSourcePolyPolygon.count();a++)
+    for(sal_uInt32 a(0);a<rSourcePolyPolygon.count();a++)
     {
         const basegfx::B3DPolygon aPoly(rSourcePolyPolygon.getB3DPolygon(a));
         sal_Int32 nPointCount(aPoly.count());
@@ -750,7 +750,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
         double* pInnerSequenceX = pOuterSequenceX->getArray();
         double* pInnerSequenceY = pOuterSequenceY->getArray();
         double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-        for(sal_uInt32 b(0L);b<aPoly.count();b++)
+        for(sal_uInt32 b(0);b<aPoly.count();b++)
         {
             const basegfx::B3DPoint aPoint(aPoly.getB3DPoint(b));
             *pInnerSequenceX++ = aPoint.getX();
@@ -759,7 +759,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
         }
         if(aPoly.isClosed())
         {
-            const basegfx::B3DPoint aPoint(aPoly.getB3DPoint(0L));
+            const basegfx::B3DPoint aPoint(aPoly.getB3DPoint(0));
             *pInnerSequenceX++ = aPoint.getX();
             *pInnerSequenceY++ = aPoint.getY();
             *pInnerSequenceZ++ = aPoint.getZ();
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index c746ae84d25a..fc0666a0b587 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -317,7 +317,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
                         sal_uIntPtr nStreamLen_ = pDest->Tell();
                         if (nStreamLen_)
                         {
-                            pDest->Seek(0L);
+                            pDest->Seek(0);
                             GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pDest ,nFormat,&nDeterminedFormat );
                         }
                     }
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index f8d6b12f48f7..12501770c85e 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -892,7 +892,7 @@ XPolyPolygon::XPolyPolygon( XPolyPolygon&& rXPolyPoly )
 XPolyPolygon::XPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon)
     : pImpXPolyPolygon()
 {
-    for(sal_uInt32 a(0L); a < rPolyPolygon.count(); a++)
+    for(sal_uInt32 a(0); a < rPolyPolygon.count(); a++)
     {
         const basegfx::B2DPolygon aCandidate = rPolyPolygon.getB2DPolygon(a);
         XPolygon aNewPoly(aCandidate);
@@ -1001,7 +1001,7 @@ basegfx::B2DPolyPolygon XPolyPolygon::getB2DPolyPolygon() const
 {
     basegfx::B2DPolyPolygon aRetval;
 
-    for(sal_uInt16 a(0L); a < Count(); a++)
+    for(sal_uInt16 a(0); a < Count(); a++)
     {
         const XPolygon& rPoly = (*this)[a];
         aRetval.append(rPoly.getB2DPolygon());
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index df6455ed33bc..f61c19c2fb29 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3374,7 +3374,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // First, determine number of anchor text node in the copied range.
             // Note: The anchor text node *have* to be inside the copied range.
-            sal_uLong nAnchorTextNdNumInRange( 0L );
+            sal_uLong nAnchorTextNdNumInRange( 0 );
             bool bAnchorTextNdFound( false );
             SwNodeIndex aIdx( rRg.aStart );
             while ( !bAnchorTextNdFound && aIdx <= rRg.aEnd )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index d3bfb40546e1..b5825827cd26 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -376,7 +376,7 @@ sal_uInt32 SwContact::GetMinOrdNum() const
 /// get maximum order number of anchored objects handled by with contact
 sal_uInt32 SwContact::GetMaxOrdNum() const
 {
-    sal_uInt32 nMaxOrdNum( 0L );
+    sal_uInt32 nMaxOrdNum( 0 );
 
     std::list< SwAnchoredObject* > aObjs;
     GetAnchoredObjs( aObjs );
@@ -1224,8 +1224,8 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
                     // use geometry of drawing object
                     aObjRect = pGroupObj->GetSnapRect();
                 }
-                SwTwips nXPosDiff(0L);
-                SwTwips nYPosDiff(0L);
+                SwTwips nXPosDiff(0);
+                SwTwips nYPosDiff(0);
                 switch ( eLayoutDir )
                 {
                     case SwFrameFormat::HORI_L2R:
@@ -2035,7 +2035,7 @@ namespace sdr
         {
             const sal_uInt32 nSubHierarchyCount(rVOC.GetViewContact().GetObjectCount());
 
-            for(sal_uInt32 a(0L); a < nSubHierarchyCount; a++)
+            for(sal_uInt32 a(0); a < nSubHierarchyCount; a++)
             {
                 const ViewObjectContact& rCandidate(rVOC.GetViewContact().GetViewContact(a).GetViewObjectContact(rVOC.GetObjectContact()));
 
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index d0c7f320dfc7..97015f858a1f 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -72,7 +72,7 @@ SwAnchoredObject::SwAnchoredObject() :
     mpPageFrame( nullptr ),
     maRelPos(),
     maLastCharRect(),
-    mnLastTopOfLine( 0L ),
+    mnLastTopOfLine( 0 ),
     mpVertPosOrientFrame( nullptr ),
     // --> #i28701#
     mbPositioningInProgress( false ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a478de201ac0..b10b65320bd9 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3237,14 +3237,14 @@ SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat
                                     _rNewAnchorFormat.GetContentAnchor()->nNode )
         {
             // determine 'old' number of anchor frames
-            sal_uInt32 nOldNumOfAnchFrame( 0L );
+            sal_uInt32 nOldNumOfAnchFrame( 0 );
             SwIterator<SwFrame,SwContentNode> aOldIter( *(aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrame* pOld = aOldIter.First(); pOld; pOld = aOldIter.Next() )
             {
                 ++nOldNumOfAnchFrame;
             }
             // determine 'new' number of anchor frames
-            sal_uInt32 nNewNumOfAnchFrame( 0L );
+            sal_uInt32 nNewNumOfAnchFrame( 0 );
             SwIterator<SwFrame,SwContentNode> aNewIter( *(_rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrame* pNew = aNewIter.First(); pNew; pNew = aNewIter.Next() )
             {
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d69501935d2c..ac9eab002f8a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2269,7 +2269,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
     if ( pNewUpper &&
          m_rThis.IsTextFrame() && !IsFollow() )
     {
-        sal_uInt32 nToPageNum( 0L );
+        sal_uInt32 nToPageNum( 0 );
         const bool bMoveFwdByObjPos = SwLayouter::FrameMovedFwdByObjPos(
                                                 *(pOldPage->GetFormat()->GetDoc()),
                                                 static_cast<SwTextFrame&>(m_rThis),
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 2543ea147380..1500b96d110b 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -417,7 +417,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext)
                     // #i40444#
                     // #i58182# - usage of new method
                     // <SwObjectFormatterTextFrame::CheckMovedFwdCondition(..)>
-                    sal_uInt32 nToPageNum( 0L );
+                    sal_uInt32 nToPageNum( 0 );
                     bool bDummy( false );
                     if ( SwObjectFormatterTextFrame::CheckMovedFwdCondition(
                                         *this, GetPageFrame()->GetPhyPageNum(),
@@ -428,7 +428,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext)
                         // directly, that it is moved forward by object positioning.
                         SwTextFrame* pAnchorTextFrame( static_cast<SwTextFrame*>(AnchorFrame()) );
                         bool bInsert( true );
-                        sal_uInt32 nAnchorFrameToPageNum( 0L );
+                        sal_uInt32 nAnchorFrameToPageNum( 0 );
                         const SwDoc& rDoc = *(GetFrameFormat().GetDoc());
                         if ( SwLayouter::FrameMovedFwdByObjPos(
                                                 rDoc, *pAnchorTextFrame, nAnchorFrameToPageNum ) )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 5beb864aa1f6..a68462a4cdc7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -719,7 +719,7 @@ SwContentNotify::SwContentNotify( SwContentFrame *pContentFrame ) :
     SwFrameNotify( pContentFrame ),
     // OD 08.01.2004 #i11859#
     mbChkHeightOfLastLine( false ),
-    mnHeightOfLastLine( 0L ),
+    mnHeightOfLastLine( 0 ),
     // OD 2004-02-26 #i25029#
     mbInvalidatePrevPrtArea( false ),
     mbBordersJoinedWithPrev( false )
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 54cb686637e6..3bbffccdc226 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -187,7 +187,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                 if ( pAnchorPageFrame != _rAnchoredObj.GetPageFrame() )
                 {
                     bool bInsert( true );
-                    sal_uInt32 nToPageNum( 0L );
+                    sal_uInt32 nToPageNum( 0 );
                     const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                     if ( SwLayouter::FrameMovedFwdByObjPos(
                                             rDoc, mrAnchorTextFrame, nToPageNum ) )
@@ -221,7 +221,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                         "<SwObjectFormatterTextFrame::DoFormatObj(..)> - anchored object not collected!?" );
                 --nIdx;
 
-                sal_uInt32 nToPageNum( 0L );
+                sal_uInt32 nToPageNum( 0 );
                 // #i43913#
                 bool bDummy( false );
                 // #i58182# - consider new method signature
@@ -233,7 +233,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     // #i49987# - consider, that anchor frame
                     // could already been marked to move forward.
                     bool bInsert( true );
-                    sal_uInt32 nMovedFwdToPageNum( 0L );
+                    sal_uInt32 nMovedFwdToPageNum( 0 );
                     const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                     if ( SwLayouter::FrameMovedFwdByObjPos(
                                             rDoc, mrAnchorTextFrame, nMovedFwdToPageNum ) )
@@ -347,7 +347,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
         // section the anchor frame is in.
         FormatAnchorFrameForCheckMoveFwd();
 
-        sal_uInt32 nToPageNum( 0L );
+        sal_uInt32 nToPageNum( 0 );
         // #i43913#
         bool bInFollow( false );
         SwAnchoredObject* pObj = nullptr;
@@ -371,7 +371,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
                  bInFollow )
             {
                 bool bInsert( true );
-                sal_uInt32 nTmpToPageNum( 0L );
+                sal_uInt32 nTmpToPageNum( 0 );
                 const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                 if ( SwLayouter::FrameMovedFwdByObjPos(
                                         rDoc, mrAnchorTextFrame, nTmpToPageNum ) )
@@ -403,7 +403,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
             // #i49987# - consider, that anchor frame
             // could already been marked to move forward.
             bool bInsert( true );
-            sal_uInt32 nMovedFwdToPageNum( 0L );
+            sal_uInt32 nMovedFwdToPageNum( 0 );
             const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
             if ( SwLayouter::FrameMovedFwdByObjPos(
                                     rDoc, mrAnchorTextFrame, nMovedFwdToPageNum ) )
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 023014503d7b..1893feb99a5d 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -477,7 +477,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
             // #i26791# - local variable <nVertOffsetToFrameAnchorPos>
             // for determination of the 'vertical' offset to the frame anchor
             // position
-            SwTwips nVertOffsetToFrameAnchorPos( 0L );
+            SwTwips nVertOffsetToFrameAnchorPos( 0 );
             // #i22341# - add special case for vertical alignment
             // at top of line.
             if ( mbAnchorToChar &&
@@ -814,7 +814,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
                 }
                 else
                 {
-                    SwTwips nTmpRelPosY( 0L );
+                    SwTwips nTmpRelPosY( 0 );
                     if ( aRectFnSet.IsVert() )
                         nTmpRelPosY = aRelPos.X() - nDist;
                     else
@@ -1004,7 +1004,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
                                       : pOrientFrame;
 
         // #i26791# - get 'horizontal' offset to frame anchor position.
-        SwTwips nHoriOffsetToFrameAnchorPos( 0L );
+        SwTwips nHoriOffsetToFrameAnchorPos( 0 );
         SwTwips nRelPosX = CalcRelPosX( *pHoriOrientFrame, aEnvOfObj,
                                          aHori, rLR, rUL, bWrapThrough,
                                          ( aRectFnSet.IsVert() ? aRelPos.X() : aRelPos.Y() ),
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index a228cddf6bae..df3ad4686991 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -80,7 +80,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
             eVertOrient = text::VertOrientation::TOP;
         }
         // #i26791# - get vertical offset to frame anchor position.
-        SwTwips nVertOffsetToFrameAnchorPos( 0L );
+        SwTwips nVertOffsetToFrameAnchorPos( 0 );
         SwTwips nRelPosY =
                 GetVertRelPos( GetAnchorFrame(), GetAnchorFrame(), eVertOrient,
                                 aVert.GetRelationOrient(), aVert.GetPos(),
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index b1c7e195bbf9..cb658e54b0cc 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -101,7 +101,7 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh,
     , rLineInf( rLnInf )
     , nX(0)
     , nRedX(0)
-    , nLineNr( 1L )
+    , nLineNr( 1 )
     , nDivider(0)
     , bGoLeft(false)
     , bLineNum( bLnNm )
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b55b00134da1..a8950e56173b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1879,8 +1879,8 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
 
     // Scaling. Must convert from pixels to twips. We know
     // that VirtualDevices use a DPI of 96.
-    Fraction scaleX = Fraction(contextWidth, 96) * Fraction(1440L) / Fraction(tileWidth);
-    Fraction scaleY = Fraction(contextHeight, 96) * Fraction(1440L) / Fraction(tileHeight);
+    Fraction scaleX = Fraction(contextWidth, 96) * Fraction(1440) / Fraction(tileWidth);
+    Fraction scaleY = Fraction(contextHeight, 96) * Fraction(1440) / Fraction(tileHeight);
     aMapMode.SetScaleX(scaleX);
     aMapMode.SetScaleY(scaleY);
     rDevice.SetMapMode(aMapMode);
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index ed043664ab97..167df7045193 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -334,7 +334,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 bEOF = bEOFSave;
 
                 // first parse the number
-                sTmpBuffer.setLength( 0L );
+                sTmpBuffer.setLength( 0 );
                 do {
                     sTmpBuffer.append( cNextCh );
                     cNextCh = GetNextChar();
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index fe787c421ee8..127f5263f60b 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -636,7 +636,7 @@ namespace sw
                 // in the given PolyPolygon. Anything else which might be thought of
                 // for reducing to a single polygon will just need nore power and
                 // cannot create more correct results.
-                sal_uInt32 nPointCount(0L);
+                sal_uInt32 nPointCount(0);
                 sal_uInt16 a;
 
                 for(a = 0; a < rPolyPoly.Count(); a++)
@@ -651,7 +651,7 @@ namespace sw
                 }
 
                 tools::Polygon aRetval((sal_uInt16)nPointCount);
-                sal_uInt32 nAppendIndex(0L);
+                sal_uInt32 nAppendIndex(0);
 
                 for(a = 0; a < rPolyPoly.Count(); a++)
                 {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2ca149ebc6c7..5d0a42530f51 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -269,7 +269,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
         }
     }
 
-    aTempStrm1.Seek(0L);
+    aTempStrm1.Seek(0);
     for (aItr = aEndCps.begin(), n = 0;aItr != aEndCps.end();++aItr,++n)
     {
         if (aItr->second)
@@ -279,7 +279,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
         }
     }
 
-    aTempStrm2.Seek(0L);
+    aTempStrm2.Seek(0);
     rWrt.WriteAsStringTable(aNames, rWrt.pFib->m_fcSttbfbkmk,rWrt.pFib->m_lcbSttbfbkmk);
     SvStream& rStrm = *rWrt.pTableStrm;
     rWrt.pFib->m_fcPlcfbkf = rStrm.Tell();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9b8795fa63b9..880bb99f79b8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2181,7 +2181,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen,
             "<SwWW8ImplReader::Read_HdFtTextAsHackedFrame(..)> - missing SdrObject instance" );
     if ( pFrameObj )
     {
-        pFrameObj->SetOrdNum( 0L );
+        pFrameObj->SetOrdNum( 0 );
     }
     MoveInsideFly(pFrame);
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c1448caa28f5..2e379537af25 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1935,7 +1935,7 @@ bToggelPos(false)
     //       the left and right border distances are different.
     // no adjustments possible, if frame has automatic width.
     // determine left border distance
-    sal_Int16 nLeBorderMgn( 0L );
+    sal_Int16 nLeBorderMgn( 0 );
     if ( !bAutoWidth )
     {
         WW8_BRCVer9 &rBrc = rWW.brc[WW8_LEFT];
@@ -1943,7 +1943,7 @@ bToggelPos(false)
         nLeBorderMgn = nLeBorderMgn + nTemp;
     }
     // determine right border distance
-    sal_Int16 nRiBorderMgn( 0L );
+    sal_Int16 nRiBorderMgn( 0 );
     if ( !bAutoWidth )
     {
         WW8_BRCVer9 &rBrc = rWW.brc[WW8_RIGHT];
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 448f8a2deaed..391e82d7f9cc 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -74,7 +74,7 @@ public:
 
     explicit SwXMLTableColumn_Impl(sal_uInt32 nPosition)
         : SwWriteTableCol(nPosition)
-        , nRelWidth(0UL)
+        , nRelWidth(0)
     {};
 
     void SetStyleName( const OUString& rName ) { sStyleName = rName; }
@@ -120,7 +120,7 @@ public:
 
 SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     pLines( &rLines ),
-    nWidth( 0UL )
+    nWidth( 0 )
 {
 #if OSL_DEBUG_LEVEL > 0
     sal_uInt32 nEndCPos = 0U;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 2f339291ed90..a2fcad1b997d 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -441,9 +441,9 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
     m_bHasStringValue(false),
     m_bValueTypeIsString(false),
     bProtect( false ),
-    nRowSpan( 1UL ),
-    nColSpan( 1UL ),
-    nColRepeat( 1UL ),
+    nRowSpan( 1 ),
+    nColSpan( 1 ),
+    nColRepeat( 1 ),
     bHasTextContent( false ),
     bHasTableContent( false )
 {
@@ -1237,9 +1237,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     m_bRelWidth( true ),
     m_bHasSubTables( false ),
     m_nHeaderRows( 0 ),
-    m_nCurRow( 0UL ),
-    m_nCurCol( 0UL ),
-    m_nWidth( 0UL )
+    m_nCurRow( 0 ),
+    m_nCurCol( 0 ),
+    m_nWidth( 0 )
 {
     OUString aName;
     OUString sXmlId;
@@ -1378,9 +1378,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     m_bRelWidth( true ),
     m_bHasSubTables( false ),
     m_nHeaderRows( 0 ),
-    m_nCurRow( 0UL ),
-    m_nCurCol( 0UL ),
-    m_nWidth( 0UL )
+    m_nCurRow( 0 ),
+    m_nCurCol( 0 ),
+    m_nWidth( 0 )
 {
 }
 
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 99e032dd4a42..07e15faad4f6 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -132,10 +132,10 @@ static void lcl_addOutplaceProperties(
 
         if( aSize.Width() && aSize.Height() )
         {
-            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), Any(0L) );
+            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), Any(sal_Int32(0)) );
             pStates++;
 
-            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(0L) );
+            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(sal_Int32(0)) );
             pStates++;
 
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any((sal_Int32)aSize.Width()) );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index c0c662b9d9aa..eec8f29ab834 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1025,14 +1025,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             aTemplateValue >>= sTmpl;
 
                             sal_Int32 nColonPos = sTmpl.indexOf( ':' );
-                            OUString sPrefix = sTmpl.copy( 0L, nColonPos );
+                            OUString sPrefix = sTmpl.copy( 0, nColonPos );
                             if ( sPrefix == "Style" )
                             {
-                                aTemplateName = sTmpl.copy( 7L );   //get string behind "Style: "
+                                aTemplateName = sTmpl.copy( 7 );   //get string behind "Style: "
                             }
                             else if ( sPrefix == "Outline" )
                             {
-                                nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve  ";
+                                nTemplateOutlineLevel = ( sTmpl.copy( 15 )).toInt32(); //get string behind "Outline: Leve  ";
                                 bCreateByOutlineLevel = true;
                             }
 
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index b5f06236d9b9..baedf94d706b 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -59,7 +59,7 @@ SwBezierShell::SwBezierShell(SwView &_rView):
 
     SwWrtShell *pSh = &GetShell();
     SdrView*    pSdrView = pSh->GetDrawView();
-    pSdrView->SetEliminatePolyPointLimitAngle(1500L);
+    pSdrView->SetEliminatePolyPointLimitAngle(1500);
 
     SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Draw));
 }
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index a9b2786bb42a..1fd18de2fa94 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -163,8 +163,8 @@ void ImplWriteControls( const css::uno::Reference< css::io::XObjectOutputStream
     sal_uInt32 nStoredControls = 0;
     sal_Int32 nDataBeginMark = xMark->createMark();
 
-    OutStream->writeLong( 0L ); // DataLen
-    OutStream->writeLong( 0L ); // nStoredControls
+    OutStream->writeLong( 0 ); // DataLen
+    OutStream->writeLong( 0 ); // nStoredControls
 
     sal_uInt32 nCtrls = rCtrls.getLength();
     for ( sal_uInt32 n = 0; n < nCtrls; n++ )
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 5e2c62f17d33..7934b320b007 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -557,7 +557,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
     for ( std::set<sal_uInt16>::const_iterator it = aProps.begin(); it != aProps.end(); ++it )
     {
         sal_Int32 nPropDataBeginMark = xMark->createMark();
-        OutStream->writeLong( 0L ); // DataLen
+        OutStream->writeLong( 0 ); // DataLen
 
         const css::uno::Any* pProp = &(maData[*it]);
         OutStream->writeShort( *it );
@@ -712,7 +712,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
         for ( sal_uInt16 n = BASEPROPERTY_FONT_TYPE; n <= BASEPROPERTY_FONT_ATTRIBS; n++ )
         {
             sal_Int32 nPropDataBeginMark = xMark->createMark();
-            OutStream->writeLong( 0L ); // DataLen
+            OutStream->writeLong( 0 ); // DataLen
             OutStream->writeShort( n ); // PropId
             OutStream->writeBoolean( false );   // Void
 
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 5af6fe04abbd..e42457e0860c 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1833,7 +1833,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon)
             basegfx::B2DCubicBezier aBezier;
             aBezier.setStartPoint(rPolygon.getB2DPoint(0));
 
-            for(sal_uInt32 a(0L); a < nLoopCount; a++)
+            for(sal_uInt32 a(0); a < nLoopCount; a++)
             {
                 // add current point (always) and remember StartPointIndex for evtl. later corrections
                 const Point aStartPoint(FRound(aBezier.getStartPoint().getX()), FRound(aBezier.getStartPoint().getY()));
@@ -1920,7 +1920,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon)
             mpImplPolygon = new ImplPolygon( static_cast< sal_uInt16 >(nTargetCount) );
             sal_uInt16 nIndex(0);
 
-            for(sal_uInt32 a(0L); a < nB2DLocalCount; a++)
+            for(sal_uInt32 a(0); a < nB2DLocalCount; a++)
             {
                 basegfx::B2DPoint aB2DPoint(rPolygon.getB2DPoint(a));
                 Point aPoint(FRound(aB2DPoint.getX()), FRound(aB2DPoint.getY()));
diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx
index 490fc6f6c746..cd75978a8c73 100644
--- a/tools/source/stream/vcompat.cxx
+++ b/tools/source/stream/vcompat.cxx
@@ -33,7 +33,7 @@ VersionCompat::VersionCompat( SvStream& rStm, StreamMode nStreamMode, sal_uInt16
         {
             mpRWStm->WriteUInt16( mnVersion );
             mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL;
-            mpRWStm->SeekRel( 4L );
+            mpRWStm->SeekRel( 4 );
         }
         else
         {
diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx
index 93378c6e581c..3166752f3273 100644
--- a/vcl/qa/cppunit/fontmetric.cxx
+++ b/vcl/qa/cppunit/fontmetric.cxx
@@ -68,13 +68,13 @@ void VclFontMetricTest::testSpacings()
     aFontMetric.SetDescent( 100 );
     CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 100L );
 
-    aFontMetric.SetExternalLeading( 100L );
+    aFontMetric.SetExternalLeading( 100 );
     CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 100L );
 
-    aFontMetric.SetInternalLeading( 100L );
+    aFontMetric.SetInternalLeading( 100 );
     CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 100L );
 
-    aFontMetric.SetLineHeight( 100L );
+    aFontMetric.SetLineHeight( 100 );
     CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 100L );
 }
 
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 5fea84fed4e2..4747301d4510 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1832,7 +1832,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
                         nStatus = ERRCODE_GRFILTER_FILTERERROR;
                     else
                     {
-                        aTempStream.Seek( 0L );
+                        aTempStream.Seek( 0 );
                         ReadGraphic( aTempStream, rGraphic );
 
                         if( aTempStream.GetError() )
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 3b2a74302d32..9b98fceca699 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -115,8 +115,8 @@ GIFReader::GIFReader( SvStream& rStm )
     , nYAcc ( 0 )
     , nLastPos ( rStm.Tell() )
     , nMaxStreamData( rStm.remainingSize() )
-    , nLogWidth100 ( 0UL )
-    , nLogHeight100 ( 0UL )
+    , nLogWidth100 ( 0 )
+    , nLogHeight100 ( 0 )
     , nGlobalWidth ( 0 )
     , nGlobalHeight ( 0 )
     , nImageWidth ( 0 )
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 6b96cb971eca..2dab4e98c59a 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -788,7 +788,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
 
 AInfo::AInfo() : pOutDev( nullptr ),
                               pViewData( nullptr ),
-                              nExtraData( 0L ),
+                              nExtraData( 0 ),
                               bPause( false ) {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index a7242f39b26e..002f617cdb1b 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -84,17 +84,17 @@ struct DIBInfoHeader
     sal_uInt32      nColsImportant;
 
     DIBInfoHeader()
-    :   nSize(0UL),
-        nWidth(0UL),
-        nHeight(0UL),
+    :   nSize(0),
+        nWidth(0),
+        nHeight(0),
         nPlanes(0),
         nBitCount(0),
         nCompression(0),
         nSizeImage(0),
-        nXPelsPerMeter(0UL),
-        nYPelsPerMeter(0UL),
-        nColsUsed(0UL),
-        nColsImportant(0UL)
+        nXPelsPerMeter(0),
+        nYPelsPerMeter(0),
+        nColsUsed(0),
+        nColsImportant(0)
     {}
 };
 
@@ -116,19 +116,19 @@ struct DIBV5Header : public DIBInfoHeader
 
     DIBV5Header()
     :   DIBInfoHeader(),
-        nV5RedMask(0UL),
-        nV5GreenMask(0UL),
-        nV5BlueMask(0UL),
-        nV5AlphaMask(0UL),
-        nV5CSType(0UL),
+        nV5RedMask(0),
+        nV5GreenMask(0),
+        nV5BlueMask(0),
+        nV5AlphaMask(0),
+        nV5CSType(0),
         aV5Endpoints(),
-        nV5GammaRed(0UL),
-        nV5GammaGreen(0UL),
-        nV5GammaBlue(0UL),
-        nV5Intent(0UL),
-        nV5ProfileData(0UL),
-        nV5ProfileSize(0UL),
-        nV5Reserved(0UL)
+        nV5GammaRed(0),
+        nV5GammaGreen(0),
+        nV5GammaBlue(0),
+        nV5Intent(0),
+        nV5ProfileData(0),
+        nV5ProfileSize(0),
+        nV5Reserved(0)
     {}
 };
 
@@ -1594,7 +1594,7 @@ bool ImplReadDIB(
 {
     const SvStreamEndian nOldFormat(rIStm.GetEndian());
     const sal_uLong nOldPos(rIStm.Tell());
-    sal_uLong nOffset(0UL);
+    sal_uLong nOffset(0);
     bool bRet(false);
 
     rIStm.SetEndian(SvStreamEndian::LITTLE);
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 812e504880ab..e67191c8a5c0 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -99,7 +99,7 @@ Size GraphicReader::GetPreviewSize() const
 
 ImpGraphic::ImpGraphic() :
         meType          ( GraphicType::NONE ),
-        mnSizeBytes     ( 0UL ),
+        mnSizeBytes     ( 0 ),
         mbSwapOut       ( false ),
         mbDummyContext  ( false )
 {
@@ -150,7 +150,7 @@ ImpGraphic::ImpGraphic(ImpGraphic&& rImpGraphic)
 ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) :
         maEx            ( rBitmap ),
         meType          ( !rBitmap.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ),
-        mnSizeBytes     ( 0UL ),
+        mnSizeBytes     ( 0 ),
         mbSwapOut       ( false ),
         mbDummyContext  ( false )
 {
@@ -159,7 +159,7 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) :
 ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) :
         maEx            ( rBitmapEx ),
         meType          ( !rBitmapEx.IsEmpty() ? GraphicType::Bitmap : GraphicType::NONE ),
-        mnSizeBytes     ( 0UL ),
+        mnSizeBytes     ( 0 ),
         mbSwapOut       ( false ),
         mbDummyContext  ( false )
 {
@@ -167,7 +167,7 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) :
 
 ImpGraphic::ImpGraphic(const VectorGraphicDataPtr& rVectorGraphicDataPtr)
 :   meType( rVectorGraphicDataPtr.get() ? GraphicType::Bitmap : GraphicType::NONE ),
-    mnSizeBytes( 0UL ),
+    mnSizeBytes( 0 ),
     mbSwapOut( false ),
     mbDummyContext  ( false ),
     maVectorGraphicData(rVectorGraphicDataPtr)
@@ -178,7 +178,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) :
         maEx            ( rAnimation.GetBitmapEx() ),
         mpAnimation     ( o3tl::make_unique<Animation>( rAnimation ) ),
         meType          ( GraphicType::Bitmap ),
-        mnSizeBytes     ( 0UL ),
+        mnSizeBytes     ( 0 ),
         mbSwapOut       ( false ),
         mbDummyContext  ( false )
 {
@@ -187,7 +187,7 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) :
 ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) :
         maMetaFile      ( rMtf ),
         meType          ( GraphicType::GdiMetafile ),
-        mnSizeBytes     ( 0UL ),
+        mnSizeBytes     ( 0 ),
         mbSwapOut       ( false ),
         mbDummyContext  ( false )
 {
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 96cf9728d657..b8cf13fe727f 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -144,8 +144,8 @@ public:
 
 ImplPointArray::ImplPointArray() :
     mpArray     ( nullptr ),
-    mnSize      ( 0UL ),
-    mnRealSize  ( 0UL )
+    mnSize      ( 0 ),
+    mnRealSize  ( 0 )
 
 {
 }
@@ -290,8 +290,8 @@ public:
 };
 
 ImplChain::ImplChain() :
-    mnArraySize ( 1024UL ),
-    mnCount     ( 0UL )
+    mnArraySize ( 1024 ),
+    mnCount     ( 0 )
 {
     mpCodes.reset( new sal_uInt8[ mnArraySize ] );
 }
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index e18b8dd878c2..bb0ee05d0f37 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -113,7 +113,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
     , mnFilterType(0)
     , mnBBP(0)
     , mbTrueAlpha(false)
-    , mnCRC(0UL)
+    , mnCRC(0)
 {
     if (!rBmpEx.IsEmpty())
     {
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index f90e22b79d9e..10008241c571 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -38,12 +38,12 @@
 
 ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
             FloatingWindow  ( pParent, 0 ),
-            mnRepaintTime   ( 1UL ),
+            mnRepaintTime   ( 1 ),
             mnTimeout       ( DEF_TIMEOUT ),
             mnWheelMode     ( WheelMode::NONE ),
-            mnActDist       ( 0UL ),
-            mnActDeltaX     ( 0L ),
-            mnActDeltaY     ( 0L )
+            mnActDist       ( 0 ),
+            mnActDeltaX     ( 0 ),
+            mnActDeltaY     ( 0 )
 {
     // we need a parent
     SAL_WARN_IF( !pParent, "vcl", "ImplWheelWindow::ImplWheelWindow(): Parent not set!" );
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index 0eda5f73e0c7..ccec26629c23 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -825,7 +825,7 @@ void AccObject::UpdateState()
         return ;
     }
 
-    m_pIMAcc->SetState(0L);
+    m_pIMAcc->SetState(0);
 
     if ( m_accRole == POPUP_MENU )
     {
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 02732cfe1cd0..5d41154e9a9f 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -136,7 +136,7 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygonPixel(const awt::Size
 
 drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
 {
-    drawing::PointSequenceSequence aPolyPolygon(1L);
+    drawing::PointSequenceSequence aPolyPolygon(1);
     drawing::PointSequence aPolygon = comphelper::containerToSequence(mPoints);
     aPolyPolygon[0] = aPolygon;
     return aPolyPolygon;
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index e63bb1fae8d7..fb22fa8281b7 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -491,7 +491,7 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri
     if(_sValue.isEmpty() || _sValue[0] != '(')
         return false;
 
-    sal_Int32 nPos(1L);
+    sal_Int32 nPos(1);
     sal_Int32 nFound = _sValue.indexOf(' ', nPos);
 
     if(nFound == -1 || nFound <= nPos)
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 0d0c02a9daa6..bd41599a6b90 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -389,9 +389,9 @@ SdXMLExport::SdXMLExport(
     bool bIsDraw, SvXMLExportFlags nExportFlags )
 :   SvXMLExport( util::MeasureUnit::CM, xContext, implementationName,
         (bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ),
-    mnDocMasterPageCount(0L),
-    mnDocDrawPageCount(0L),
-    mnObjectCount(0L),
+    mnDocMasterPageCount(0),
+    mnDocDrawPageCount(0),
+    mnObjectCount(0),
     mpPageMasterInfoList(new ImpXMLEXPPageMasterList),
     mpPageMasterUsageList(new ImpXMLEXPPageMasterList),
     mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList),
@@ -604,13 +604,13 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
 // #82003# helper function for recursive object count
 sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(const Reference< drawing::XShapes >& xShapes)
 {
-    sal_uInt32 nRetval(0L);
+    sal_uInt32 nRetval(0);
 
     if(xShapes.is())
     {
         sal_Int32 nCount = xShapes->getCount();
 
-        for(sal_Int32 a(0L); a < nCount; a++)
+        for(sal_Int32 a(0); a < nCount; a++)
         {
             Any aAny(xShapes->getByIndex(a));
             Reference< drawing::XShapes > xGroup;
@@ -2174,7 +2174,7 @@ void SdXMLExport::ExportAutoStyles_()
         }
 
         // create auto style infos for objects on master pages
-        for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++)
+        for(sal_Int32 nMPageId(0); nMPageId < mnDocMasterPageCount; nMPageId++)
         {
             Reference< XDrawPage > xMasterPage(mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY );
 
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 10010ca83ec0..b99022d4f471 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -268,8 +268,8 @@ SdXMLImport::SdXMLImport(
     OUString const & implementationName,
     bool bIsDraw, SvXMLImportFlags nImportFlags )
 :   SvXMLImport( xContext, implementationName, nImportFlags ),
-    mnNewPageCount(0L),
-    mnNewMasterPageCount(0L),
+    mnNewPageCount(0),
+    mnNewMasterPageCount(0),
     mbIsDraw(bIsDraw),
     mbLoadDoc(true),
     mbPreview(false),
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 375de1e64ba6..364750933364 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1920,7 +1920,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
                                   XML_FRAME, bCreateNewline, true );
 
         // evtl. corner radius?
-        sal_Int32 nCornerRadius(0L);
+        sal_Int32 nCornerRadius(0);
         xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
         if(nCornerRadius)
         {
@@ -1954,7 +1954,7 @@ void XMLShapeExport::ImpExportRectangleShape(
         ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
 
         // evtl. corner radius?
-        sal_Int32 nCornerRadius(0L);
+        sal_Int32 nCornerRadius(0);
         xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
         if(nCornerRadius)
         {
@@ -2934,7 +2934,7 @@ void XMLShapeExport::ImpExportCaptionShape(
         ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
 
         // evtl. corner radius?
-        sal_Int32 nCornerRadius(0L);
+        sal_Int32 nCornerRadius(0);
         xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
         if(nCornerRadius)
         {
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 250a5b0064e6..afa03e0857cb 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -248,7 +248,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
     OUString aEmptySpace(" ");
 
     const sal_uInt32 nCount = maList.size();
-    for(sal_uInt32 a(0L); a < nCount; a++)
+    for(sal_uInt32 a(0); a < nCount; a++)
     {
         ImpSdXMLExpTransObj2DBase* pObj = maList[a].get();
         switch(pObj->mnType)
@@ -481,7 +481,7 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans)
     rFullTrans.identity();
 
     const sal_uInt32 nCount = maList.size();
-    for(sal_uInt32 a(0L); a < nCount; a++)
+    for(sal_uInt32 a(0); a < nCount; a++)
     {
         ImpSdXMLExpTransObj2DBase* pObj = maList[a].get();
         switch(pObj->mnType)
@@ -626,7 +626,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
     OUString aEmptySpace(" ");
 
     const sal_uInt32 nCount = maList.size();
-    for(sal_uInt32 a(0L); a < nCount; a++)
+    for(sal_uInt32 a(0); a < nCount; a++)
     {
         ImpSdXMLExpTransObj3DBase* pObj = maList[a].get();
         switch(pObj->mnType)
@@ -959,7 +959,7 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans)
     rFullTrans.identity();
 
     const sal_uInt32 nCount = maList.size();
-    for(sal_uInt32 a(0L); a < nCount; a++)
+    for(sal_uInt32 a(0); a < nCount; a++)
     {
         ImpSdXMLExpTransObj3DBase* pObj = maList[a].get();
         switch(pObj->mnType)
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index bb30e4510aac..d7ab3c60d38a 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -75,7 +75,7 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
     uno::Reference< drawing::XShape > xShape;
     while(rShapes->getCount())
     {
-        rShapes->getByIndex(0L) >>= xShape;
+        rShapes->getByIndex(0) >>= xShape;
         if(xShape.is())
             rShapes->remove(xShape);
     }
author	Noel Grandin <noel.grandin@collabora.co.uk>	2017-08-16 14:45:49 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2017-08-17 08:14:31 +0200
commit	ff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch)
tree	272dfa9af5ead31b61c1be34afcaf4402ff4ad77
parent	224b770fa77fe12ad5dc543ce020aca316b6558d (diff)