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>

61 files changed, 184 insertions, 184 deletions

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());