remove UL/L suffixes from integer constants on the RHS of expressions

Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d)

Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/45452
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781)

49 files changed, 169 insertions, 169 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 85886b22ec3e..757fe235ba1f 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1494,7 +1494,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                     break;
                 case MOVETO :
                 {
-                    if(aNewB2DPolygon.count() > 1L)
+                    if(aNewB2DPolygon.count() > 1)
                     {
                         // #i76201# Add conversion to closed polygon when first and last points are equal
                         basegfx::tools::checkClosed(aNewB2DPolygon);
@@ -1520,7 +1520,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 {
                     if(aNewB2DPolygon.count())
                     {
-                        if(aNewB2DPolygon.count() > 1L)
+                        if(aNewB2DPolygon.count() > 1)
                         {
                             aNewB2DPolygon.setClosed(true);
                             aNewB2DPolyPolygon.append(aNewB2DPolygon);
@@ -1551,7 +1551,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 {
                     if ( nPntCount )
                     {
-                        if(aNewB2DPolygon.count() > 1L)
+                        if(aNewB2DPolygon.count() > 1)
                         {
                             // #i76201# Add conversion to closed polygon when first and last points are equal
                             basegfx::tools::checkClosed(aNewB2DPolygon);
@@ -1758,7 +1758,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 case ARC :
                 case CLOCKWISEARC :
                 {
-                    if(aNewB2DPolygon.count() > 1L)
+                    if(aNewB2DPolygon.count() > 1)
                     {
                         // #i76201# Add conversion to closed polygon when first and last points are equal
                         basegfx::tools::checkClosed(aNewB2DPolygon);
@@ -1940,7 +1940,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
     if ( rSegmentInd == nSegInfoSize )
         rSegmentInd++;
 
-    if(aNewB2DPolygon.count() > 1L)
+    if(aNewB2DPolygon.count() > 1)
     {
         // #i76201# Add conversion to closed polygon when first and last points are equal
         basegfx::tools::checkClosed(aNewB2DPolygon);
@@ -2257,7 +2257,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly )
             vObjectList = vTempList;
         }
 
-        if(1L == vObjectList.size())
+        if(1 == vObjectList.size())
         {
             // a single object, correct some values
             AdaptObjColor(*vObjectList[0L],rCustomShapeSet,nColorIndex,nColorCount);
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index a52bfffe4097..c68563193055 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -214,7 +214,7 @@ basegfx::B3DPolygon EnhancedCustomShape3d::Transformation2D::ApplySkewSettings(
     basegfx::B3DPolygon aRetval;
 
     sal_uInt32 j;
-    for ( j = 0L; j < rPoly3D.count(); j++ )
+    for ( j = 0; j < rPoly3D.count(); j++ )
     {
         const basegfx::B3DPoint aPoint(rPoly3D.getB3DPoint(j));
         double fDepth(-( aPoint.getZ() * fSkew ) / 100.0);
@@ -748,12 +748,12 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS
     basegfx::B3DPolygon aBoundVolume;
     const tools::Polygon aPolygon( rBoundRect );
 
-    for ( i = 0L; i < 4L; i++ )
+    for ( i = 0; i < 4; i++ )
     {
         aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionForward));
     }
 
-    for ( i = 0L; i < 4L; i++ )
+    for ( i = 0; i < 4; i++ )
     {
         aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward));
     }
@@ -786,7 +786,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS
         aBoundVolume = aTransformation2D.ApplySkewSettings( aBoundVolume );
 
     tools::Polygon aTransformed( 8 );
-    for ( i = 0L; i < 8L; i++ )
+    for ( i = 0; i < 8; i++ )
         aTransformed[ (sal_uInt16)i ] = aTransformation2D.Transform2D( aBoundVolume.getB3DPoint( i ) );
 
     return aTransformed.GetBoundRect();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2b0555820971..6851783f1d32 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -346,7 +346,7 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic )
 {
     aUndoGraphic = aRedoGraphic = Graphic();
     aGraphic = rGraphic;
-    nGrfChanged = 0UL;
+    nGrfChanged = 0;
     m_pContourWnd->SetGraphic( aGraphic );
 }
 
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 3b90b0bb7f3f..2662d16c441c 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -105,7 +105,7 @@ public:
 
     void                SetGraphic( const Graphic& rGraphic );
     const Graphic&      GetGraphic() const { return aGraphic; }
-    bool                IsGraphicChanged() const { return nGrfChanged > 0UL; }
+    bool                IsGraphicChanged() const { return nGrfChanged > 0; }
 
     void                SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
     tools::PolyPolygon  GetPolyPolygon();
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index da2e7fb0a3d4..12d06a0144c6 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -118,7 +118,7 @@ public:
 
 Imp3DDepthRemapper::Imp3DDepthRemapper(E3dScene& rScene)
 {
-    // only called when rScene.GetSubList() and nObjCount > 1L
+    // only called when rScene.GetSubList() and nObjCount > 1
     SdrObjList* pList = rScene.GetSubList();
     const size_t nObjCount(pList->GetObjCount());
 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9457839c1c70..7d21a32d995e 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2496,7 +2496,7 @@ void DbGridControl::MoveToLast()
 
 void DbGridControl::MoveToPrev()
 {
-    long nNewRow = std::max(GetCurRow() - 1L, 0L);
+    long nNewRow = std::max(GetCurRow() - 1, 0L);
     if (GetCurRow() != nNewRow)
         MoveToPosition(nNewRow);
 }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index bac41bc254fb..76a4b01c92e8 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1262,7 +1262,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor
                 // const SdrPageViewWinList& rWinList = pPageView->GetWinList();
                 // const SdrPageViewWindows& rPageViewWindows = pPageView->GetPageViewWindows();
 
-                for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ )
+                for( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); i++ )
                 {
                     const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i);
 
@@ -1415,7 +1415,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
                 // const SdrPageViewWinList& rWinList = pPageView->GetWinList();
                 // const SdrPageViewWindows& rPageViewWindows = pPageView->GetPageViewWindows();
 
-                for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ )
+                for( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); i++ )
                 {
                     const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i);
 
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index aeb7a5dd0066..914b57c9eca2 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -76,7 +76,7 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
     aCodec.Compress( rStmToWrite, rStm );
     aCodec.EndCompression();
 
-    nCompSize = rStm.Tell() - nPos - 4UL;
+    nCompSize = rStm.Tell() - nPos - 4;
     rStm.Seek( nPos );
     rStm.WriteUInt32( nCompSize );
     rStm.Seek( STREAM_SEEK_TO_END );
@@ -102,7 +102,7 @@ void GalleryCodec::Read( SvStream& rStmToRead )
             std::unique_ptr<sal_uInt8[]> pOutBuf(new sal_uInt8[ nUnCompressedSize ]);
             sal_uInt8*  pTmpBuf = pOutBuf.get();
             sal_uInt8*  pLast = pOutBuf.get() + nUnCompressedSize - 1;
-            sal_uIntPtr   nIndex = 0UL, nCountByte, nRunByte;
+            sal_uIntPtr   nIndex = 0, nCountByte, nRunByte;
             bool    bEndDecoding = false;
 
             do
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3b5207437059..6089585bd079 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -978,8 +978,8 @@ sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
         }
     }
 
-    rSelPos.X() = std::max( std::min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L );
-    rSelPos.Y() = std::max( std::min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L );
+    rSelPos.X() = std::max( std::min( rSelPos.X(), aOutputSizePixel.Width() - 1 ), 0L );
+    rSelPos.Y() = std::max( std::min( rSelPos.Y(), aOutputSizePixel.Height() - 1 ), 0L );
 
     if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) )
     {
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 85b94a664000..f9cf78dd8669 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -93,7 +93,7 @@ namespace sdr
 
                 // ensure step forward in integer timing, the floating step difference maybe smaller than 1.0. Use
                 // at least 25ms for next step
-                const sal_uInt32 nMinimumStepTime((sal_uInt32)fCurrentTime + 25L);
+                const sal_uInt32 nMinimumStepTime((sal_uInt32)fCurrentTime + 25);
 
                 if(nNextTime <= nMinimumStepTime)
                 {
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 9936dfdb4be6..cfee290d1c7b 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -142,7 +142,7 @@ namespace sdr
             {
                 // without delta time, init events by triggering them. This will invalidate
                 // painted objects and add them to the scheduler again
-                mnDeltaTime = 0L;
+                mnDeltaTime = 0;
                 triggerEvents();
                 checkTimeout();
              }
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 4f3c6baab603..9ca3d87cdf45 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -99,7 +99,7 @@ namespace sdr
         // for control
         bool TimerEventHandler::IsEmpty() const
         {
-            return (0L == maVector.size());
+            return (0 == maVector.size());
         }
 
         // The timer when it is triggered; from class Timer
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 8ede68ce1708..794200fbd87a 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -263,14 +263,14 @@ namespace sdr
                     // truncate aRegionRectanglePixel to destination pixel size, more does
                     // not need to be prepared since destination is a buffer for a window. So,
                     // maximum size indirectly shall be limited to getOutputDevice().GetOutputSizePixel()
-                    if(aRegionRectanglePixel.Left() < 0L)
+                    if(aRegionRectanglePixel.Left() < 0)
                     {
-                        aRegionRectanglePixel.Left() = 0L;
+                        aRegionRectanglePixel.Left() = 0;
                     }
 
-                    if(aRegionRectanglePixel.Top() < 0L)
+                    if(aRegionRectanglePixel.Top() < 0)
                     {
-                        aRegionRectanglePixel.Top() = 0L;
+                        aRegionRectanglePixel.Top() = 0;
                     }
 
                     if(aRegionRectanglePixel.Right() > aDestinationSizePixel.getWidth())
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index e150b19469f5..7d1aed4ecf56 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -275,7 +275,7 @@ namespace drawinglayer
 
             if(nTempStartWidth)
             {
-                if(nTempStartWidth < 0L)
+                if(nTempStartWidth < 0)
                 {
                     fStartWidth = ((double)(-nTempStartWidth) * fWidth) * 0.01;
                 }
@@ -298,7 +298,7 @@ namespace drawinglayer
 
             if(nTempEndWidth)
             {
-                if(nTempEndWidth < 0L)
+                if(nTempEndWidth < 0)
                 {
                     fEndWidth = ((double)(-nTempEndWidth) * fWidth) * 0.01;
                 }
@@ -882,7 +882,7 @@ namespace drawinglayer
             css::drawing::ProjectionMode aProjectionMode(css::drawing::ProjectionMode_PARALLEL);
             const sal_uInt16 nProjectionValue(static_cast<const Svx3DPerspectiveItem&>(rSet.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue());
 
-            if(1L == nProjectionValue)
+            if(1 == nProjectionValue)
             {
                 aProjectionMode = css::drawing::ProjectionMode_PERSPECTIVE;
             }
@@ -897,15 +897,15 @@ namespace drawinglayer
             css::drawing::ShadeMode aShadeMode(css::drawing::ShadeMode_FLAT);
             const sal_uInt16 nShadeValue(static_cast<const Svx3DShadeModeItem&>(rSet.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue());
 
-            if(1L == nShadeValue)
+            if(1 == nShadeValue)
             {
                 aShadeMode = css::drawing::ShadeMode_PHONG;
             }
-            else if(2L == nShadeValue)
+            else if(2 == nShadeValue)
             {
                 aShadeMode = css::drawing::ShadeMode_SMOOTH;
             }
-            else if(3L == nShadeValue)
+            else if(3 == nShadeValue)
             {
                 aShadeMode = css::drawing::ShadeMode_DRAFT;
             }
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index d8434d62db20..c565f983e8c6 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
@@ -39,11 +39,11 @@ namespace drawinglayer
             css::drawing::NormalsKind aNormalsKind(css::drawing::NormalsKind_SPECIFIC);
             const sal_uInt16 nNormalsValue(static_cast<const Svx3DNormalsKindItem&>(rSet.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue());
 
-            if(1L == nNormalsValue)
+            if(1 == nNormalsValue)
             {
                 aNormalsKind = css::drawing::NormalsKind_FLAT;
             }
-            else if(2L == nNormalsValue)
+            else if(2 == nNormalsValue)
             {
                 aNormalsKind = css::drawing::NormalsKind_SPHERE;
             }
@@ -55,11 +55,11 @@ namespace drawinglayer
             css::drawing::TextureProjectionMode aTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC);
             const sal_uInt16 nTextureValueX(static_cast<const Svx3DTextureProjectionXItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue());
 
-            if(1L == nTextureValueX)
+            if(1 == nTextureValueX)
             {
                 aTextureProjectionX = css::drawing::TextureProjectionMode_PARALLEL;
             }
-            else if(2L == nTextureValueX)
+            else if(2 == nTextureValueX)
             {
                 aTextureProjectionX = css::drawing::TextureProjectionMode_SPHERE;
             }
@@ -68,11 +68,11 @@ namespace drawinglayer
             css::drawing::TextureProjectionMode aTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC);
             const sal_uInt16 nTextureValueY(static_cast<const Svx3DTextureProjectionYItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue());
 
-            if(1L == nTextureValueY)
+            if(1 == nTextureValueY)
             {
                 aTextureProjectionY = css::drawing::TextureProjectionMode_PARALLEL;
             }
-            else if(2L == nTextureValueY)
+            else if(2 == nTextureValueY)
             {
                 aTextureProjectionY = css::drawing::TextureProjectionMode_SPHERE;
             }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 09703ceffadd..13b8f4ceaa26 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1065,7 +1065,7 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
     fRight  -= maRect.getWidth();
     fBottom -= maRect.getHeight();
 
-    const double fMaxLong((double)(MetricField::ConvertValue( LONG_MAX, 0, MapUnit::Map100thMM, meDlgUnit ) - 1L));
+    const double fMaxLong((double)(MetricField::ConvertValue( LONG_MAX, 0, MapUnit::Map100thMM, meDlgUnit ) - 1));
     fLeft = basegfx::clamp(fLeft, -fMaxLong, fMaxLong);
     fRight = basegfx::clamp(fRight, -fMaxLong, fMaxLong);
     fTop = basegfx::clamp(fTop, - fMaxLong, fMaxLong);
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 9fab1ba153f3..548580eb3cb5 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -46,7 +46,7 @@ bool PolyPolygonEditor::DeletePoints( const std::set< sal_uInt16 >& rAbsPoints )
 
             aCandidate.remove(nPnt);
 
-            if( ( mbIsClosed && aCandidate.count() < 3L) || (aCandidate.count() < 2L) )
+            if( ( mbIsClosed && aCandidate.count() < 3) || (aCandidate.count() < 2) )
             {
                 maPolyPolygon.remove(nPoly);
             }
@@ -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 9b7e9b1b8ad5..84cfd5d0880b 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -237,7 +237,7 @@ namespace
 
         if(aCandidate.count())
         {
-            const sal_uInt32 nLoopCount(aCandidate.isClosed() ? aCandidate.count() : aCandidate.count() - 1L);
+            const sal_uInt32 nLoopCount(aCandidate.isClosed() ? aCandidate.count() : aCandidate.count() - 1);
             rOutDev.SetFillColor();
             rOutDev.SetLineColor(aColor);
 
@@ -254,7 +254,7 @@ namespace
 
     void impTryTest(const SdrPageView& rPageView, OutputDevice& rOutDev)
     {
-        if(rPageView.GetPage() && rPageView.GetPage()->GetObjCount() >= 2L)
+        if(rPageView.GetPage() && rPageView.GetPage()->GetObjCount() >= 2)
         {
             SdrPage* pPage = rPageView.GetPage();
             SdrObject* pObjA = pPage->GetObj(0L);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index c3519a3fcbe0..d1527eebc105 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1313,7 +1313,7 @@ bool SdrTextAniAmountItem::GetPresentation(
     sal_Int32 nValue(GetValue());
 
     if(!nValue)
-        nValue = -1L;
+        nValue = -1;
 
     if(nValue < 0)
     {
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 74de5e46e874..ed1ffd1d0b84 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -284,7 +284,7 @@ void SdrEditView::EndUndo()
     // #i13033#
     // Comparison changed to 1L since EndUndo() is called later now
     // and EndUndo WILL change count to count-1
-    if(1L == mpModel->GetUndoBracketLevel())
+    if(1 == mpModel->GetUndoBracketLevel())
     {
         ImpBroadcastEdgesOfMarkedNodes();
     }
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index dddb0bd0ee98..aa5b6b3cf009 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -524,7 +524,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
         XPolygon aXP((sal_uInt16)nPointCount);
         sal_uInt32 nPtNum;
 
-        for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
+        for(nPtNum = 0; nPtNum < nPointCount; nPtNum++)
         {
             Point aPt(pO->GetPoint(nPtNum));
             aXP[(sal_uInt16)nPtNum]=aPt;
@@ -537,7 +537,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
             case SdrCrookMode::Stretch: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
         }
 
-        for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
+        for(nPtNum = 0; nPtNum < nPointCount; nPtNum++)
         {
             // broadcasting could be optimized here, but for the
             // current two points of the measurement object, it's fine
@@ -638,7 +638,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
         XPolygon aXP((sal_uInt16)nPointCount);
         sal_uInt32 nPtNum;
 
-        for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
+        for(nPtNum = 0; nPtNum < nPointCount; nPtNum++)
         {
             Point aPt(pO->GetPoint(nPtNum));
             aXP[(sal_uInt16)nPtNum]=aPt;
@@ -646,7 +646,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
 
         aXP.Distort(rRef, rDistortedRect);
 
-        for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
+        for(nPtNum = 0; nPtNum < nPointCount; nPtNum++)
         {
             // broadcasting could be optimized here, but for the
             // current two points of the measurement object it's fine
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index d0a15ece7dc6..3fc220ee9425 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -688,19 +688,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));
 
@@ -708,10 +708,10 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
             {
                 if(aCandidate.count())
                 {
-                    const basegfx::B2DPoint aCA(aCandidate.getB2DPoint(0L));
-                    const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1L));
-                    const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0L));
-                    const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1L));
+                    const basegfx::B2DPoint aCA(aCandidate.getB2DPoint(0));
+                    const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1));
+                    const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0));
+                    const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1));
 
                     const double fRACA(basegfx::B2DVector(aCA - aRA).getLength());
                     const double fRACB(basegfx::B2DVector(aCB - aRA).getLength());
@@ -791,7 +791,7 @@ void SdrEditView::DistributeMarkedObjects()
                 if(eHor != SvxDistributeHorizontal::NONE)
                 {
                     // build sorted entry list
-                    nFullLength = 0L;
+                    nFullLength = 0;
 
                     for( size_t a = 0; a < nMark; ++a )
                     {
@@ -886,7 +886,7 @@ void SdrEditView::DistributeMarkedObjects()
                 if(eVer != SvxDistributeVertical::NONE)
                 {
                     // build sorted entry list
-                    nFullLength = 0L;
+                    nFullLength = 0;
 
                     for( size_t a = 0; a < nMark; ++a )
                     {
@@ -1301,7 +1301,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
 
             if(!pInsOL)
             {
-                nInsPos = pObj->GetOrdNum() + 1L;
+                nInsPos = pObj->GetOrdNum() + 1;
                 pInsPV = pM->GetPageView();
                 pInsOL = pObj->GetObjList();
             }
@@ -1323,17 +1323,17 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
     {
         SdrObjKind eKind = OBJ_PATHFILL;
 
-        if(nPolyCount > 1L)
+        if(nPolyCount > 1)
         {
             aPolyPolygon.setClosed(true);
         }
         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)
+            if(nPointCount <= 2)
             {
                 eKind = OBJ_PATHLINE;
             }
@@ -1341,8 +1341,8 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
             {
                 if(!aPolygon.isClosed())
                 {
-                    const basegfx::B2DPoint aPointA(aPolygon.getB2DPoint(0L));
-                    const basegfx::B2DPoint aPointB(aPolygon.getB2DPoint(nPointCount - 1L));
+                    const basegfx::B2DPoint aPointA(aPolygon.getB2DPoint(0));
+                    const basegfx::B2DPoint aPointB(aPolygon.getB2DPoint(nPointCount - 1));
                     const double fDistance(basegfx::B2DVector(aPointB - aPointA).getLength());
                     const double fJoinTolerance(10.0);
 
@@ -1408,18 +1408,18 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon,
     bool bCan(false);
     const sal_uInt32 nPolygonCount(rPpolyPolygon.count());
 
-    if(nPolygonCount >= 2L)
+    if(nPolygonCount >= 2)
     {
         // #i69172# dismantle makes sense with 2 or more polygons in a polyPolygon
         bCan = true;
     }
-    else if(bMakeLines && 1L == nPolygonCount)
+    else if(bMakeLines && 1 == nPolygonCount)
     {
         // #i69172# ..or with at least 2 edges (curves or lines)
         const basegfx::B2DPolygon aPolygon(rPpolyPolygon.getB2DPolygon(0L));
         const sal_uInt32 nPointCount(aPolygon.count());
 
-        if(nPointCount > 2L)
+        if(nPointCount > 2)
         {
             bCan = true;
         }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 4159b61fe656..d35b11e1b0f5 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -737,7 +737,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
 
     if(!bBrk && !pWin)
     {
-        for(i = 0L; i < nWinCount && !pWin; i++)
+        for(i = 0; i < nWinCount && !pWin; i++)
         {
             SdrPaintWindow* pPaintWindow = GetPaintWindow(i);
 
@@ -881,7 +881,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
             // register all windows as OutlinerViews with the Outliner
             if(!bOnlyOneView)
             {
-                for(i = 0L; i < nWinCount; i++)
+                for(i = 0; i < nWinCount; i++)
                 {
                     SdrPaintWindow* pPaintWindow = GetPaintWindow(i);
                     OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a19a53422688..c673dc4e118e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -783,7 +783,7 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc
 
         if(pLastPoly)
         {
-            if(1L == pLastPoly->GetPathPoly().count())
+            if(1 == pLastPoly->GetPathPoly().count())
             {
                 bool bOk(false);
                 basegfx::B2DPolygon aDstPoly(pLastPoly->GetPathPoly().getB2DPolygon(0L));
@@ -796,32 +796,32 @@ bool ImpSdrGDIMetaFileImport::CheckLastLineMerge(const basegfx::B2DPolygon& rSrc
 
                 if(aDstPoly.count())
                 {
-                    const sal_uInt32 nMaxDstPnt(aDstPoly.count() - 1L);
-                    const sal_uInt32 nMaxSrcPnt(rSrcPoly.count() - 1L);
+                    const sal_uInt32 nMaxDstPnt(aDstPoly.count() - 1);
+                    const sal_uInt32 nMaxSrcPnt(rSrcPoly.count() - 1);
 
                     if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(0L))
                     {
-                        aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L);
+                        aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1);
                         bOk = true;
                     }
                     else if(aDstPoly.getB2DPoint(0L) == rSrcPoly.getB2DPoint(nMaxSrcPnt))
                     {
                         basegfx::B2DPolygon aNew(rSrcPoly);
-                        aNew.append(aDstPoly, 1L, aDstPoly.count() - 1L);
+                        aNew.append(aDstPoly, 1L, aDstPoly.count() - 1);
                         aDstPoly = aNew;
                         bOk = true;
                     }
                     else if(aDstPoly.getB2DPoint(0L) == rSrcPoly.getB2DPoint(0L))
                     {
                         aDstPoly.flip();
-                        aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1L);
+                        aDstPoly.append(rSrcPoly, 1L, rSrcPoly.count() - 1);
                         bOk = true;
                     }
                     else if(aDstPoly.getB2DPoint(nMaxDstPnt) == rSrcPoly.getB2DPoint(nMaxSrcPnt))
                     {
                         basegfx::B2DPolygon aNew(rSrcPoly);
                         aNew.flip();
-                        aDstPoly.append(aNew, 1L, aNew.count() - 1L);
+                        aDstPoly.append(aNew, 1L, aNew.count() - 1);
                         bOk = true;
                     }
                 }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 2f8a46854969..d483f6aed95d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -926,8 +926,8 @@ sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
         }
         else
         {
-            sal_uInt16 nCenX((sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1L) >> 1);
-            sal_uInt16 nCenY((sal_uInt16)(aBmpEx.GetSizePixel().Height() - 1L) >> 1);
+            sal_uInt16 nCenX((sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1) >> 1);
+            sal_uInt16 nCenY((sal_uInt16)(aBmpEx.GetSizePixel().Height() - 1) >> 1);
 
             if(aMoveOutsideOffset.X() > 0)
             {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 6cf64c9e1da6..edd162c47d32 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -437,7 +437,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
 {
     const size_t nCount(GetMarkCount());
 
-    if(mbNameOk && 1L == nCount)
+    if(mbNameOk && 1 == nCount)
     {
         // if it's a single selection, cache only text frame
         const SdrObject* pObj = GetMark(0)->GetMarkedSdrObj();
@@ -458,7 +458,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
         {
             const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
         }
-        else if(1L == nCount)
+        else if(1 == nCount)
         {
             if(pMark->GetMarkedSdrObj())
             {
@@ -549,7 +549,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
         const SdrMark* pMark = GetMark(n1stMarkNum);
         OUString aNam;
 
-        if(1L == nMarkPtObjAnz)
+        if(1 == nMarkPtObjAnz)
         {
             if(pMark->GetMarkedSdrObj())
             {
@@ -587,7 +587,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
 
         OUString aStr1;
 
-        if(1L == nMarkPtAnz)
+        if(1 == nMarkPtAnz)
         {
             aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoint : STR_ViewMarkedPoint));
         }
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 131d2ad5eb65..05fa868d46ea 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1187,7 +1187,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
 {
     // #i22167#
     // change to double precision usage to not lose decimal places
-    const bool bNegative(nVal < 0L);
+    const bool bNegative(nVal < 0);
     SvtSysLocale aSysLoc;
     const LocaleDataWrapper& rLoc(aSysLoc.GetLocaleData());
     double fLocalValue(double(nVal) * double(aUIUnitFact));
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 729778bb9cf4..dfbdf177b5ce 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -137,7 +137,7 @@ void SdrMarkView::ImpClearVars()
     mbPlusHdlAlways=false;
     mnFrameHandlesLimit=50;
     mbInsPolyPoint=false;
-    mnInsPointNum = 0L;
+    mnInsPointNum = 0;
     mbMarkedObjRectDirty=false;
     mbMarkedPointsRectsDirty=false;
     mbMarkHandlesHidden = false;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index de9124fa705f..1bb0dbaf4f6b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1191,7 +1191,7 @@ SdrHdl* SdrObject::GetPlusHdl(const SdrHdl& /*rHdl*/, sal_uInt32 /*nPlNum*/) con
 void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const
 {
     sal_uInt32 nCount=GetHdlCount();
-    for (sal_uInt32 i=0L; i<nCount; i++) {
+    for (sal_uInt32 i=0; i<nCount; i++) {
         SdrHdl* pHdl=GetHdl(i);
         if (pHdl!=nullptr) {
             rHdlList.AddHdl(pHdl);
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 65822737b2f6..dfc6738fba96 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -273,7 +273,7 @@ sal_uInt32 SdrCaptionObj::GetHdlCount() const
 {
     sal_uInt32 nCount1(SdrRectObj::GetHdlCount());
     // Currently only dragging the tail's end is implemented.
-    return nCount1 + 1L;
+    return nCount1 + 1;
 }
 
 SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index e4b3a01d49f0..dfc640f98434 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -176,13 +176,13 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
         if(!bNeed && meCircleKind == OBJ_CARC)
         {
             // start of the line is here if StartPolygon, StartWidth!=0
-            bNeed=static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue().count() != 0L &&
+            bNeed=static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue().count() != 0 &&
                   static_cast<const XLineStartWidthItem&>(rSet.Get(XATTR_LINESTARTWIDTH)).GetValue() != 0;
 
             if(!bNeed)
             {
                 // end of the line is here if EndPolygon, EndWidth!=0
-                bNeed = static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue().count() != 0L &&
+                bNeed = static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue().count() != 0 &&
                         static_cast<const XLineEndWidthItem&>(rSet.Get(XATTR_LINEENDWIDTH)).GetValue() != 0;
             }
         }
@@ -388,7 +388,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const
 {
     if (meCircleKind==OBJ_CIRC)
     {
-        nHdlNum += 2L;
+        nHdlNum += 2;
     }
 
     SdrHdl* pH = nullptr;
@@ -406,7 +406,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const
         case 1:
             aPnt = GetAnglePnt(maRect,nEndAngle);
             eLocalKind = SdrHdlKind::Circle;
-            nPNum = 2L;
+            nPNum = 2;
             break;
         case 2:
             aPnt = maRect.TopLeft();
@@ -759,12 +759,12 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeCreatePoly(const SdrDragStat& rDrag) con
 {
     const ImpCircUser* pU = static_cast<const ImpCircUser*>(rDrag.GetUser());
 
-    if(rDrag.GetPointCount() < 4L)
+    if(rDrag.GetPointCount() < 4)
     {
         // force to OBJ_CIRC to get full visualisation
         basegfx::B2DPolyPolygon aRetval(ImpCalcXPolyCirc(OBJ_CIRC, pU->aR, pU->nStart, pU->nEnd));
 
-        if(3L == rDrag.GetPointCount())
+        if(3 == rDrag.GetPointCount())
         {
             // add edge to first point on ellipse
             basegfx::B2DPolygon aNew;
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index e0e349442da5..1614448faad7 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -924,7 +924,7 @@ sal_uInt32 SdrGrafObj::GetHdlCount() const
 
 SdrHdl* SdrGrafObj::GetHdl(sal_uInt32 nHdlNum) const
 {
-    return SdrRectObj::GetHdl( nHdlNum + 1L );
+    return SdrRectObj::GetHdl( nHdlNum + 1 );
 }
 
 void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 286e6088fdf8..4712d2b7f070 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -358,7 +358,7 @@ long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, lon
 
     if(bCenter)
     {
-        nHeight /= 2L;
+        nHeight /= 2;
     }
 
     return nHeight;
@@ -1113,14 +1113,14 @@ sal_uInt32 SdrMeasureObj::GetPointCount() const
 
 Point SdrMeasureObj::GetPoint(sal_uInt32 i) const
 {
-     return (0L == i) ? aPt1 : aPt2;
+     return (0 == i) ? aPt1 : aPt2;
 }
 
 void SdrMeasureObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
 {
-    if (0L == i)
+    if (0 == i)
         aPt1=rPnt;
-    if (1L == i)
+    if (1 == i)
         aPt2=rPnt;
     SetRectsDirty();
     SetTextDirty();
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 21feaf92474a..d1a06cf77fe0 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -295,7 +295,7 @@ void ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Poi
 
     // #i21479#
     // Also copy the end point when no end point is set yet
-    if (!bMouseDown || (0L == aBezEnd.X() && 0L == aBezEnd.Y())) aBezEnd=rP2;
+    if (!bMouseDown || (0 == aBezEnd.X() && 0 == aBezEnd.Y())) aBezEnd=rP2;
 
     bBezier=bRet;
 }
@@ -879,7 +879,7 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
                 basegfx::B2DPolygon aCandidate(aTempPolyPolygon.getB2DPolygon(nPoly));
                 aCandidate.remove(nPnt);
 
-                if(aCandidate.count() < 2L)
+                if(aCandidate.count() < 2)
                 {
                     aTempPolyPolygon.remove(nPoly);
                 }
@@ -1575,9 +1575,9 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr
         return aRetval;
 
     ImpPathCreateUser* pU = static_cast<ImpPathCreateUser*>(rDrag.GetUser());
-    basegfx::B2DPolygon aNewPolygon(aRetval.count() ? aRetval.getB2DPolygon(aRetval.count() - 1L) : basegfx::B2DPolygon());
+    basegfx::B2DPolygon aNewPolygon(aRetval.count() ? aRetval.getB2DPolygon(aRetval.count() - 1) : basegfx::B2DPolygon());
 
-    if(pU->IsFormFlag() && aNewPolygon.count() > 1L)
+    if(pU->IsFormFlag() && aNewPolygon.count() > 1)
     {
         // remove last segment and replace with current
         // do not forget to rescue the previous control point which will be lost when
@@ -1598,7 +1598,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr
 
     if(aRetval.count())
     {
-        aRetval.setB2DPolygon(aRetval.count() - 1L, aNewPolygon);
+        aRetval.setB2DPolygon(aRetval.count() - 1, aNewPolygon);
     }
     else
     {
@@ -1691,7 +1691,7 @@ SdrPathObj::~SdrPathObj()
 
 static bool lcl_ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
 {
-    return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0L).count());
+    return (1 == rPolyPolygon.count() && 2 == rPolyPolygon.getB2DPolygon(0).count());
 }
 
 static Rectangle lcl_ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon)
@@ -1707,9 +1707,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);
@@ -1890,9 +1890,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)
             {
@@ -2594,8 +2594,8 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bo
         double fSmallestCut;
         basegfx::tools::getSmallestDistancePointToPolyPolygon(GetPathPoly(), aTestPoint, nSmallestPolyIndex, nSmallestEdgeIndex, fSmallestCut);
         basegfx::B2DPolygon aCandidate(GetPathPoly().getB2DPolygon(nSmallestPolyIndex));
-        const bool bBefore(!aCandidate.isClosed() && 0L == nSmallestEdgeIndex && 0.0 == fSmallestCut);
-        const bool bAfter(!aCandidate.isClosed() && aCandidate.count() == nSmallestEdgeIndex + 2L && 1.0 == fSmallestCut);
+        const bool bBefore(!aCandidate.isClosed() && 0 == nSmallestEdgeIndex && 0.0 == fSmallestCut);
+        const bool bAfter(!aCandidate.isClosed() && aCandidate.count() == nSmallestEdgeIndex + 2 && 1.0 == fSmallestCut);
 
         if(bBefore)
         {
@@ -2611,7 +2611,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bo
                 }
             }
 
-            nNewHdl = 0L;
+            nNewHdl = 0;
         }
         else if(bAfter)
         {
@@ -2627,7 +2627,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bo
                 }
             }
 
-            nNewHdl = aCandidate.count() - 1L;
+            nNewHdl = aCandidate.count() - 1;
         }
         else
         {
@@ -2667,10 +2667,10 @@ sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bo
             }
             else
             {
-                aCandidate.insert(nSmallestEdgeIndex + 1L, aTestPoint);
+                aCandidate.insert(nSmallestEdgeIndex + 1, aTestPoint);
             }
 
-            nNewHdl = nSmallestEdgeIndex + 1L;
+            nNewHdl = nSmallestEdgeIndex + 1;
         }
 
         maPathPolygon.setB2DPolygon(nSmallestPolyIndex, aCandidate);
@@ -2694,7 +2694,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
 
     if(PolyPolygonEditor::GetRelativePolyPoint(aLocalPolyPolygon, nHdlNum, nPoly, nPnt))
     {
-        if(0L == nPoly)
+        if(0 == nPoly)
         {
             const basegfx::B2DPolygon aCandidate(aLocalPolyPolygon.getB2DPolygon(nPoly));
             const sal_uInt32 nPointCount(aCandidate.count());
@@ -2714,10 +2714,10 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
                 }
                 else
                 {
-                    if(nPointCount >= 3L && nPnt != 0L && nPnt + 1L < nPointCount)
+                    if(nPointCount >= 3 && nPnt != 0 && nPnt + 1 < nPointCount)
                     {
                         // split in two objects at point nPnt
-                        basegfx::B2DPolygon aSplitPolyA(aCandidate, 0L, nPnt + 1L);
+                        basegfx::B2DPolygon aSplitPolyA(aCandidate, 0L, nPnt + 1);
                         SetPathPoly(basegfx::B2DPolyPolygon(aSplitPolyA));
 
                         pNewObj = Clone();
@@ -2875,7 +2875,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() > 0 && GetPathPoly().getB2DPolygon(0).count() > 1, "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/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 6824c46bad95..2b59fd0aa072 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1864,7 +1864,7 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
     // get outliner set up. To avoid getting a somehow rotated MetaFile,
     // temporarily disable object rotation.
     sal_Int32 nAngle(aGeo.nRotationAngle);
-    aGeo.nRotationAngle = 0L;
+    aGeo.nRotationAngle = 0;
     ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXKorreg );
     aGeo.nRotationAngle = nAngle;
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index e97b77cf50a0..f3915087ebbb 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -754,8 +754,8 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
 
     // add one to rage sizes to get back to the old Rectangle and outliner measurements
-    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L));
-    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L));
+    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
+    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1));
     const OutlinerParaObject* pOutlinerParaObject = rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject();
     OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with no OutlinerParaObject (!)");
     const bool bVerticalWriting(pOutlinerParaObject->IsVertical());
@@ -921,8 +921,8 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
     }
 
     // add one to rage sizes to get back to the old Rectangle and outliner measurements
-    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L));
-    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L));
+    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
+    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1));
     const bool bVerticalWriting(rSdrBlockTextPrimitive.getOutlinerParaObject().IsVertical());
     const bool bTopToBottom(rSdrBlockTextPrimitive.getOutlinerParaObject().IsTopToBottom());
     const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));
@@ -1303,7 +1303,7 @@ void impCreateAlternateTiming(const SfxItemSet& rSet, drawinglayer::animation::A
     const double fHalfInnerPath(fTimeForInnerPath * 0.5);
     const sal_uInt32 nDoubleRepeat(nRepeat / 2L);
 
-    if(nDoubleRepeat || 0L == nRepeat)
+    if(nDoubleRepeat || 0 == nRepeat)
     {
         // double forth and back loop
         drawinglayer::animation::AnimationEntryLoop aLoop(nDoubleRepeat ? nDoubleRepeat : ENDLESS_LOOP);
@@ -1354,9 +1354,9 @@ void impCreateSlideTiming(const SfxItemSet& rSet, drawinglayer::animation::Anima
     rAnimList.append(aOutIn);
 
     // loop. In loop, move out and in again
-    if(nRepeat > 1L || 0L == nRepeat)
+    if(nRepeat > 1 || 0 == nRepeat)
     {
-        drawinglayer::animation::AnimationEntryLoop aLoop(nRepeat ? nRepeat - 1L : ENDLESS_LOOP);
+        drawinglayer::animation::AnimationEntryLoop aLoop(nRepeat ? nRepeat - 1 : ENDLESS_LOOP);
         drawinglayer::animation::AnimationEntryLinear aTime0(fTimeFullPath * 0.5, fFrequency, 0.5, fStartPosition);
         aLoop.append(aTime0);
         drawinglayer::animation::AnimationEntryLinear aTime1(fTimeFullPath * 0.5, fFrequency, fStartPosition, 0.5);
@@ -1517,8 +1517,8 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
 
     // add one to rage sizes to get back to the old Rectangle and outliner measurements
-    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L));
-    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L));
+    const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
+    const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1));
 
     // Text
     const OutlinerParaObject* pOutlinerParaObject = rSdrChainedTextPrimitive.getSdrText()->GetOutlinerParaObject();
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 3e6e5f3df65e..69a143222e45 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -712,7 +712,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
                 aShadowDecomposition);
             sal_uInt32 a;
 
-            for(a = 0L; a < nLoopCount; a++)
+            for(a = 0; a < nLoopCount; a++)
             {
                 // filter text portions for this paragraph
                 ::std::vector< const impPathTextPortion* > aParagraphTextPortions;
@@ -740,7 +740,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
                 // add shadow primitives to decomposition
                 aRetvalA.resize(nShadowCount);
 
-                for(a = 0L; a < nShadowCount; a++)
+                for(a = 0; a < nShadowCount; a++)
                 {
                     aRetvalA[a] = drawinglayer::primitive2d::Primitive2DReference(aShadowDecomposition[a]);
                 }
@@ -763,7 +763,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
                 // add normal primitives to decomposition
                 aRetvalB.resize(nRegularCount);
 
-                for(a = 0L; a < nRegularCount; a++)
+                for(a = 0; a < nRegularCount; a++)
                 {
                     aRetvalB[a] = drawinglayer::primitive2d::Primitive2DReference(aRegularDecomposition[a]);
                 }
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index fabe609f5cee..407d6ccd1e76 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -395,7 +395,7 @@ void SdrPageView::DrawLayer( SdrLayerID nID, OutputDevice* pGivenTarget, sdr::co
 
 void SdrPageView::SetDesignMode( bool _bDesignMode ) const
 {
-    for ( sal_uInt32 i = 0L; i < PageWindowCount(); ++i )
+    for ( sal_uInt32 i = 0; i < PageWindowCount(); ++i )
     {
         const SdrPageWindow& rPageViewWindow = *GetPageWindow(i);
         rPageViewWindow.SetDesignMode( _bDesignMode );
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 109532e176c5..ab3fc2e87ca2 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -557,7 +557,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
         count = nRepeatCount;
     }
 
-    for(a = 0L; a < count; a++)
+    for(a = 0; a < count; a++)
     {
 #endif // SVX_REPAINT_TIMER_TEST
 
@@ -628,7 +628,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
 
         if(!bTimesInited)
         {
-            for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++)
+            for(a = 0; a < REMEMBERED_TIMES_COUNT; a++)
             {
                 fLastTimes[a] = fTimePerPaint;
             }
@@ -637,17 +637,17 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
         }
         else
         {
-            for(a = 1L; a < REMEMBERED_TIMES_COUNT; a++)
+            for(a = 1; a < REMEMBERED_TIMES_COUNT; a++)
             {
-                fLastTimes[a - 1L] = fLastTimes[a];
+                fLastTimes[a - 1] = fLastTimes[a];
             }
 
-            fLastTimes[REMEMBERED_TIMES_COUNT - 1L] = fTimePerPaint;
+            fLastTimes[REMEMBERED_TIMES_COUNT - 1] = fTimePerPaint;
         }
 
         double fAddedTimes(0.0);
 
-        for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++)
+        for(a = 0; a < REMEMBERED_TIMES_COUNT; a++)
         {
             fAddedTimes += fLastTimes[a];
         }
@@ -658,7 +658,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s
         fprintf(stderr, "StartTime : %" SAL_PRIuUINT64 ", StopTime: %" SAL_PRIuUINT64 ", NeededTime: %" SAL_PRIuUINT64 ", TimePerPaint: %f\n", nStartTime, nStopTime, nNeededTime, fTimePerPaint);
         fprintf(stderr, "Remembered times: ");
 
-        for(a = 0L; a < REMEMBERED_TIMES_COUNT; a++)
+        for(a = 0; a < REMEMBERED_TIMES_COUNT; a++)
         {
             fprintf(stderr, "%d: %f ", a, fLastTimes[a]);
         }
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index b8b0356ad5cd..6a6bd3bcccc9 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -104,7 +104,7 @@ void SdrPolyEditView::CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmoot
         if(PolyPolygonEditor::GetRelativePolyPoint(pPath->GetPathPoly(), nNum, nPolyNum, nPntNum))
         {
             const basegfx::B2DPolygon aLocalPolygon(pPath->GetPathPoly().getB2DPolygon(nPolyNum));
-            bool bCanSegment(bClosed || nPntNum < aLocalPolygon.count() - 1L);
+            bool bCanSegment(bClosed || nPntNum < aLocalPolygon.count() - 1);
 
             if(!bSetMarkedSegmentsKindPossible && bCanSegment)
             {
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 2129b24a1a3c..285df2634e28 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -345,7 +345,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 > 0; i++)
                     {
                         Point aP(pO->GetSnapPoint(i));
                         dx1=x-aP.X();
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index ef00503274af..dfa658e53025 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -30,7 +30,7 @@
 
 void SdrViewIter::ImpInitVars()
 {
-    mnListenerNum = 0L;
+    mnListenerNum = 0;
     mpAktView = nullptr;
 }
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 3a12bd5ba16e..623570e2216c 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -206,7 +206,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt
         SdrOutliner& rOutliner = pObj->GetModel()->GetHitTestOutliner();
         rOutliner.SetText(*pObj->GetOutlinerParaObject());
 
-        if(1L == rOutliner.GetParagraphCount())
+        if(1 == rOutliner.GetParagraphCount())
         {
             SfxStyleSheet* pCandidate = rOutliner.GetStyleSheet(0L);
 
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index a008b808dc76..34f99685ac83 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -870,7 +870,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild(
     sal_Int32 nChildren = const_cast<AccessibleTableShape*>(this)->getAccessibleChildCount();
 
     if( nSelectedChildIndex >= nChildren )
-        return -1L;
+        return -1;
 
     sal_Int32 n = 0;
     while( n < nChildren )
@@ -885,7 +885,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild(
         ++n;
     }
 
-    return n < nChildren ? n : -1L;
+    return n < nChildren ? n : -1;
 }
 void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException )
 {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 3e7316647d66..d736132f1ced 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -392,9 +392,9 @@ void SvxLineEndWindow::FillValueSet()
             OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" );
 
             pVD->DrawBitmap( aPt0, aBmp );
-            aLineEndSet->InsertItem((sal_uInt16)((i+1L)*2L+1L),
+            aLineEndSet->InsertItem((sal_uInt16)((i+1)*2L+1),
                     Image(pVD->GetBitmap(aPt0, aBmpSize)), pEntry->GetName());
-            aLineEndSet->InsertItem((sal_uInt16)((i+2L)*2L),
+            aLineEndSet->InsertItem((sal_uInt16)((i+2)*2L),
                     Image(pVD->GetBitmap(aPt1, aBmpSize)), pEntry->GetName());
         }
         nLines = std::min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c5e79c0ad634..ca6d8e9e027a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2470,7 +2470,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
             {
                 SdrModel* pModel = pPageObj->GetModel();
                 SdrPage* pNewPage = nullptr;
-                const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1L));
+                const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1));
 
                 if(pModel)
                 {
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 53a6691a2254..a747aa392e72 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -438,7 +438,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
     const Size  aSize( rBmp.GetSizePixel() );
     Bitmap      aRetBmp;
 
-    if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
+    if( ( aSize.Width() > 2 ) && ( aSize.Height() > 2 ) )
     {
         Bitmap aWorkBmp( rBmp );
 
@@ -453,9 +453,9 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
             if( pReadAcc && pWriteAcc )
             {
                 const long          nWidth = aSize.Width();
-                const long          nWidth2 = nWidth - 2L;
+                const long          nWidth2 = nWidth - 2;
                 const long          nHeight = aSize.Height();
-                const long          nHeight2 = nHeight - 2L;
+                const long          nHeight2 = nHeight - 2;
                 const long          lThres2 = (long) cThreshold * cThreshold;
                 const sal_uInt8 nWhitePalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_WHITE))));
                 const sal_uInt8 nBlackPalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_BLACK))));
@@ -465,14 +465,14 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
 
                 // initialize border with white pixels
                 pWriteAcc->SetLineColor( Color( COL_WHITE) );
-                pWriteAcc->DrawLine( Point(), Point( nWidth - 1L, 0L ) );
-                pWriteAcc->DrawLine( Point( nWidth - 1L, 0L ), Point( nWidth - 1L, nHeight - 1L ) );
-                pWriteAcc->DrawLine( Point( nWidth - 1L, nHeight - 1L ), Point( 0L, nHeight - 1L ) );
-                pWriteAcc->DrawLine( Point( 0, nHeight - 1L ), Point() );
+                pWriteAcc->DrawLine( Point(), Point( nWidth - 1, 0L ) );
+                pWriteAcc->DrawLine( Point( nWidth - 1, 0L ), Point( nWidth - 1, nHeight - 1 ) );
+                pWriteAcc->DrawLine( Point( nWidth - 1, nHeight - 1 ), Point( 0L, nHeight - 1 ) );
+                pWriteAcc->DrawLine( Point( 0, nHeight - 1 ), Point() );
 
-                for( long nY = 0L, nY1 = 1L, nY2 = 2; nY < nHeight2; nY++, nY1++, nY2++ )
+                for( long nY = 0, nY1 = 1, nY2 = 2; nY < nHeight2; nY++, nY1++, nY2++ )
                 {
-                    for( long nX = 0L, nXDst = 1L, nXTmp; nX < nWidth2; nX++, nXDst++ )
+                    for( long nX = 0, nXDst = 1, nXTmp; nX < nWidth2; nX++, nXDst++ )
                     {
                         nXTmp = nX;
 
@@ -551,12 +551,12 @@ tools::Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const XOutFlags nFla
             const Size&         rPrefSize = aWorkBmp.GetPrefSize();
             const double        fFactorX = (double) rPrefSize.Width() / nWidth;
             const double        fFactorY = (double) rPrefSize.Height() / nHeight;
-            const long          nStartX1 = aWorkRect.Left() + 1L;
+            const long          nStartX1 = aWorkRect.Left() + 1;
             const long          nEndX1 = aWorkRect.Right();
-            const long          nStartX2 = nEndX1 - 1L;
-            const long          nStartY1 = aWorkRect.Top() + 1L;
+            const long          nStartX2 = nEndX1 - 1;
+            const long          nStartY1 = aWorkRect.Top() + 1;
             const long          nEndY1 = aWorkRect.Bottom();
-            const long          nStartY2 = nEndY1 - 1L;
+            const long          nStartY2 = nEndY1 - 1;
             std::unique_ptr<Point[]> pPoints1;
             std::unique_ptr<Point[]> pPoints2;
             long                nX, nY;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 73eb20dc5ba1..bfaf7b38e561 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1364,7 +1364,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
             return new XLineStartItem( "", maPolyPolygon );
         }
 
-        if( maPolyPolygon.count() > 1L )
+        if( maPolyPolygon.count() > 1 )
         {
             // check if the polygon is closed
             if(!maPolyPolygon.isClosed())
@@ -1647,7 +1647,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
             return new XLineEndItem( "", maPolyPolygon );
         }
 
-        if( maPolyPolygon.count() > 1L )
+        if( maPolyPolygon.count() > 1 )
         {
             // check if the polygon is closed
             if(!maPolyPolygon.isClosed())
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0307e31b8431..513f29bd9d12 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -640,7 +640,7 @@ bool XFillBmpSizeXItem::GetPresentation
 
 bool XFillBmpSizeXItem::HasMetrics() const
 {
-    return GetValue() > 0L;
+    return GetValue() > 0;
 }
 
 // class XFillBmpTileSizeYItem
@@ -682,7 +682,7 @@ bool XFillBmpSizeYItem::GetPresentation
 
 bool XFillBmpSizeYItem::HasMetrics() const
 {
-    return GetValue() > 0L;
+    return GetValue() > 0;
 }
 
 // class XFillBmpTileLogItem