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)

24 files changed, 62 insertions, 62 deletions

diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index d5e5dad9845f..ed3db401f37a 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -110,12 +110,12 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
         case PageKind::Handout:
         {
 //          #11420# for models used to transfer drawing shapes via clipboard it's ok to not have a handout page
-            DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
+            DBG_ASSERT(nPgNum == 0, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
             if (nPgNum == 0)
                 pRetval = mpHandoutPage;
             else
             {
-                DBG_ASSERT(nPgNum == 0L,
+                DBG_ASSERT(nPgNum == 0,
                     "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
             }
             break;
@@ -150,7 +150,7 @@ sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind)
         {
             if(mpHandoutPage)
             {
-                nRetval = 1L;
+                nRetval = 1;
             }
 
             break;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 4443c4262891..c773402b4af8 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2793,14 +2793,14 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo
     OUStringBuffer aStr;
     const sal_uInt32 nNoOfPolygons(rPolyPolygon.count());
 
-    for ( sal_uInt32 nXPoly = 0L; nXPoly < nNoOfPolygons; nXPoly++ )
+    for ( sal_uInt32 nXPoly = 0; nXPoly < nNoOfPolygons; nXPoly++ )
     {
         const ::basegfx::B2DPolygon& aPolygon = rPolyPolygon.getB2DPolygon(nXPoly);
         const sal_uInt32 nNoOfPoints(aPolygon.count());
 
         aStr.append("<area shape=\"polygon\" alt=\"\" coords=\"");
 
-        for ( sal_uInt32 nPoint = 0L; nPoint < nNoOfPoints; nPoint++ )
+        for ( sal_uInt32 nPoint = 0; nPoint < nNoOfPoints; nPoint++ )
         {
             const ::basegfx::B2DPoint aB2DPoint(aPolygon.getB2DPoint(nPoint));
             Point aPnt(FRound(aB2DPoint.getX()), FRound(aB2DPoint.getY()));
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 79af5b81f845..ae01b515dbc2 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -494,8 +494,8 @@ SfxItemSet*  SdModule::CreateItemSet( sal_uInt16 nSlot )
     pRet->Put( SdOptionsSnapItem( pOptions, pFrameView ) );
 
     // TP_SCALE:
-    sal_uInt32 nW = 10L;
-    sal_uInt32 nH = 10L;
+    sal_uInt32 nW = 10;
+    sal_uInt32 nH = 10;
     sal_Int32  nX;
     sal_Int32  nY;
     if( pDocSh )
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index efcebc1442f1..247fb43e3874 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -109,12 +109,12 @@ void CopyDlg::Reset()
         else
             m_pNumFldCopies->SetValue( 1L );
 
-        long nMoveX = 500L;
+        long nMoveX = 500;
         if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
             nMoveX = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
         SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, MapUnit::Map100thMM);
 
-        long nMoveY = 500L;
+        long nMoveY = 500;
         if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) )
             nMoveY = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
         SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, MapUnit::Map100thMM);
@@ -124,12 +124,12 @@ void CopyDlg::Reset()
         else
             m_pMtrFldAngle->SetValue( 0L );
 
-        long nWidth = 0L;
+        long nWidth = 0;
         if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
             nWidth = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
         SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, MapUnit::Map100thMM);
 
-        long nHeight = 0L;
+        long nHeight = 0;
         if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) )
             nHeight = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
         SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, MapUnit::Map100thMM);
@@ -244,11 +244,11 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void)
 {
     m_pNumFldCopies->SetValue( 1L );
 
-    long nValue = 500L;
+    long nValue = 500;
     SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
     SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
 
-    nValue = 0L;
+    nValue = 0;
     m_pMtrFldAngle->SetValue( nValue );
     SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
     SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8c6673011075..7a5dc67728e4 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -313,7 +313,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
     m_pLbPages->SetDropDownLineCount(10);
 
     // fill Listbox with page names of Docs
-    for( long nPage = 0L;
+    for( long nPage = 0;
          nPage < rDoc.GetSdPageCount( PageKind::Standard );
          nPage++ )
     {
@@ -409,7 +409,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void* p)
             sal_uLong nPosCP = TREELIST_APPEND;
             SvTreeListEntry* pEntry = m_pLbCustomPages->FirstSelected();
             if( pEntry )
-                nPosCP = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ) + 1L;
+                nPosCP = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ) + 1;
 
             for( sal_Int32 i = 0; i < nCount; i++ )
             {
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 54818e24a3be..dc22b52ac769 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -223,9 +223,9 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
 void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
                               long nPosX, long nPosY, long nWidth, long nHeight )
 {
-    sal_uLong           nSumR = 0UL, nSumG = 0UL, nSumB = 0UL;
-    const long      nRight = nPosX + nWidth - 1L;
-    const long      nBottom = nPosY + nHeight - 1L;
+    sal_uLong           nSumR = 0, nSumG = 0, nSumB = 0;
+    const long      nRight = nPosX + nWidth - 1;
+    const long      nBottom = nPosY + nHeight - 1;
     const double    fMult = 1.0 / ( nWidth * nHeight );
 
     for( long nY = nPosY; nY <= nBottom; nY++ )
@@ -249,11 +249,11 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
 
     aRect = PixelToLogic( aRect, rMtf.GetPrefMapMode() );
 
-    if( aRect.Right() > ( rMaxSize.Width() - 1L ) )
-        aRect.Right() = rMaxSize.Width() - 1L;
+    if( aRect.Right() > ( rMaxSize.Width() - 1 ) )
+        aRect.Right() = rMaxSize.Width() - 1;
 
-    if( aRect.Bottom() > ( rMaxSize.Height() - 1L ) )
-        aRect.Bottom() = rMaxSize.Height() - 1L;
+    if( aRect.Bottom() > ( rMaxSize.Height() - 1 ) )
+        aRect.Bottom() = rMaxSize.Height() - 1;
 
     rMtf.AddAction( new MetaLineColorAction( aColor, true ) );
     rMtf.AddAction( new MetaFillColorAction( aColor, true ) );
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 5555593fbb28..1087c488bd2f 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -509,7 +509,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
         OUString aArrowName( SVX_RES(nResId) );
         long nCount = pLineEndList->Count();
         long nIndex;
-        for( nIndex = 0L; nIndex < nCount; nIndex++ )
+        for( nIndex = 0; nIndex < nCount; nIndex++ )
         {
             const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nIndex);
             if( pEntry->GetName() == aArrowName )
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 3fb2dc929646..065314cc4772 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -127,7 +127,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
         }
 
         Rectangle           aRect;
-        sal_Int32               lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L;
+        sal_Int32               lWidth = 0, lHeight = 0, lSizeX = 0, lSizeY = 0, lAngle = 0;
         sal_uInt16              nNumber = 0;
         Color               aStartColor, aEndColor;
         bool                bColor = false;
@@ -189,13 +189,13 @@ void FuCopy::DoExecute( SfxRequest& rReq )
         // calculate number of possible copies
         aRect = mpView->GetAllMarkedRect();
 
-        if( lWidth < 0L )
+        if( lWidth < 0 )
         {
             long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth;
             nNumber = (sal_uInt16) std::min( nTmp, (long)nNumber );
         }
 
-        if( lHeight < 0L )
+        if( lHeight < 0 )
         {
             long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight;
             nNumber = (sal_uInt16) std::min( nTmp, (long)nNumber );
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 009a2f39426c..4e22123d6862 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -128,11 +128,11 @@ void FuMorph::DoExecute( SfxRequest& )
             {
                 aPolyPoly1 = ::basegfx::tools::correctOrientations(aPolyPoly1);
                 aPolyPoly1.removeDoublePoints();
-                ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0L)));
+                ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0)));
 
                 aPolyPoly2 = ::basegfx::tools::correctOrientations(aPolyPoly2);
                 aPolyPoly2.removeDoublePoints();
-                ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0L)));
+                ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0)));
 
                 // set same orientation
                 if(eIsClockwise1 != eIsClockwise2)
@@ -149,7 +149,7 @@ void FuMorph::DoExecute( SfxRequest& )
                     aPolyPoly2.flip();
 
                 // force same point counts
-                for( sal_uInt32 a(0L); a < aPolyPoly1.count(); a++ )
+                for( sal_uInt32 a(0); a < aPolyPoly1.count(); a++ )
                 {
                     ::basegfx::B2DPolygon aSub1(aPolyPoly1.getB2DPolygon(a));
                     ::basegfx::B2DPolygon aSub2(aPolyPoly2.getB2DPolygon(a));
@@ -195,21 +195,21 @@ void FuMorph::DoExecute( SfxRequest& )
     {
         // length of step in dest poly
         ::basegfx::B2DPolygon aRetval;
-        const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1L));
+        const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1));
         double fDestPos(0.0);
         double fSrcPos(0.0);
-        sal_uInt32 nSrcPos(0L);
-        sal_uInt32 nSrcPosNext((nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L);
+        sal_uInt32 nSrcPos(0);
+        sal_uInt32 nSrcPosNext((nSrcPos + 1 == rCandidate.count()) ? 0L : nSrcPos + 1);
         double fNextSrcLen(::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength());
 
-        for(sal_uInt32 b(0L); b < nNum; b++)
+        for(sal_uInt32 b(0); b < nNum; b++)
         {
             // calc fDestPos in source
             while(fSrcPos + fNextSrcLen < fDestPos)
             {
                 fSrcPos += fNextSrcLen;
                 nSrcPos++;
-                nSrcPosNext = (nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L;
+                nSrcPosNext = (nSrcPos + 1 == rCandidate.count()) ? 0L : nSrcPos + 1;
                 fNextSrcLen = ::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength();
             }
 
@@ -224,7 +224,7 @@ void FuMorph::DoExecute( SfxRequest& )
             fDestPos += fStep;
         }
 
-        if(aRetval.count() >= 3L)
+        if(aRetval.count() >= 3)
         {
             aRetval.setClosed(rCandidate.isClosed());
         }
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index eb7cfae7535a..a5114eab4395 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -664,9 +664,9 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
                 Point     aCurCenter(aCurRect.Center());
                 const ::basegfx::B2DPolyPolygon& rPolyPolygon = pPath->GetPathPoly();
                 sal_uInt32 nNoOfPolygons(rPolyPolygon.count());
-                const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nNoOfPolygons - 1L));
+                const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nNoOfPolygons - 1));
                 sal_uInt32 nPoints(aPolygon.count());
-                const ::basegfx::B2DPoint aNewB2DCenter(aPolygon.getB2DPoint(nPoints - 1L));
+                const ::basegfx::B2DPoint aNewB2DCenter(aPolygon.getB2DPoint(nPoints - 1));
                 const Point aNewCenter(FRound(aNewB2DCenter.getX()), FRound(aNewB2DCenter.getY()));
                 Size aDistance(aNewCenter.X() - aCurCenter.X(), aNewCenter.Y() - aCurCenter.Y());
                 pRunningObj->Move(aDistance);
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 7ef6ab46b3b4..4adb3f6b9762 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -628,14 +628,14 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
                     {
                         pEdgeObj = static_cast<SdrEdgeObj*>(pHdl->GetObj());
 
-                        if(0L == pHdl->GetPointNum())
+                        if(0 == pHdl->GetPointNum())
                         {
                             if(pEdgeObj->GetConnection(true).GetObject())
                             {
                                 bIsMoveOfConnectedHandle = true;
                             }
                         }
-                        if(1L == pHdl->GetPointNum())
+                        if(1 == pHdl->GetPointNum())
                         {
                             if(pEdgeObj->GetConnection(false).GetObject())
                             {
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index f1e024947f0e..f599f96037bc 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -176,7 +176,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
         long nAngle0  = GetAngle(aMDPos - mpView->GetRef1());
         nAngle0 -= 27000;
         nAngle0 = NormAngle360(nAngle0);
-        bMirrorSide0 = nAngle0 < 18000L;
+        bMirrorSide0 = nAngle0 < 18000;
 
         if (!pHdl && mpView->Is3DRotationCreationActive())
         {
@@ -731,7 +731,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                      long nAngle1  = GetAngle(aPnt - mpView->GetRef1());
                      nAngle1 -= 27000;
                      nAngle1 = NormAngle360(nAngle1);
-                     bool bMirrorSide1 = nAngle1 < 18000L;
+                     bool bMirrorSide1 = nAngle1 < 18000;
 
                      if (bMirrorSide0 != bMirrorSide1)
                      {
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 8d3a4218839f..a240333659cc 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -67,7 +67,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
     SdPage*         pPage = nullptr;
     long            nPage;
 
-    for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1L; nPage >= 0L; nPage-- )
+    for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1; nPage >= 0; nPage-- )
     {
         pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PageKind::Standard );
         OUString aStr( pPage->GetName() );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 30109b5a98bf..d974014a57d9 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -267,7 +267,7 @@ public:
 
     void            LockInput();
     void            UnlockInput();
-    bool            IsInputLocked() const { return mnLockCount > 0UL; }
+    bool            IsInputLocked() const { return mnLockCount > 0; }
 
     sal_uInt16      GetCurPageId() { return maTabControl->GetCurPageId(); }
     sal_uInt16      GetCurPagePos() { return maTabControl->GetCurPagePos(); }
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e3d5a4c59c29..63b0c11d9967 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -662,7 +662,7 @@ void SAL_CALL SlideshowImpl::disposing()
         Help::EnableExtHelp();
 
         showChildWindows();
-        mnChildMask = 0UL;
+        mnChildMask = 0;
     }
 
     // show current window again
@@ -2391,7 +2391,7 @@ static const FncGetChildWindowId aShowChildren[] =
 
 void SlideshowImpl::hideChildWindows()
 {
-    mnChildMask = 0UL;
+    mnChildMask = 0;
 
     if( ANIMATIONMODE_SHOW == meAnimationMode )
     {
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index ef80dac94e08..a3be158f7f2d 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -29,7 +29,7 @@
 // previews that are currently not visible.  The visible previews are all
 // held in memory at all times.  This default is used only when the
 // configuration does not have a value.
-static const sal_Int32 MAXIMAL_CACHE_SIZE = 4L*1024L*1024L;
+static const sal_Int32 MAXIMAL_CACHE_SIZE = 4*1024L*1024L;
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 9292cf50a08e..d3718f76ee73 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -454,7 +454,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
  * Paint-method: Redirect event to the view
  */
 
-void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
+void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0*/)
 {
     if( mpVDev )
     {
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index ef1926241799..5271ed2e1293 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -458,14 +458,14 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
                 nStartPara = 0;
                 nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1;
             }
-            long nUpper = 0L;
+            long nUpper = 0;
             for( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
             {
                 const SfxItemSet& rItems = pOLV->GetOutliner()->GetParaAttribs( nPara );
                 const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( rItems.Get( EE_PARA_ULSPACE ) );
                 nUpper = std::max( nUpper, (long)rItem.GetUpper() );
             }
-            if( nUpper == 0L )
+            if( nUpper == 0 )
                 rSet.DisableItem( SID_PARASPACE_DECREASE );
         }
         else
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index b70b424eb046..94e44b1236f6 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -787,8 +787,8 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
     {
         RulerLine   pHLines[2];
         RulerLine   pVLines[2];
-        long        nHOffs = 0L;
-        long        nVOffs = 0L;
+        long        nHOffs = 0;
+        long        nVOffs = 0;
         sal_uInt16      nCnt;
 
         if (mpHorizontalRuler.get() != nullptr)
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 31ce3316ed54..0713916b1f46 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -325,7 +325,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
     OUString aName( "DrawViewShell" );
     SetName (aName);
 
-    mnLockCount = 0UL;
+    mnLockCount = 0;
 
     uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
 
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 5dfe6f600908..4954cde4fe50 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1323,7 +1323,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
     if( pFirstPara == pLastPara )
     {
         // how many pages are we before the selected page?
-        sal_uLong nPos = 0L;
+        sal_uLong nPos = 0;
         while( pFirstPara )
         {
             pFirstPara = pOlView->GetPrevTitle( pFirstPara );
@@ -1673,7 +1673,7 @@ void OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
     // how many paragraphs in the outline?
     sal_Int32 nTitlePara     = rOutliner.GetAbsPos( pPara );
     sal_Int32 nPara          = nTitlePara + 1;
-    sal_Int32 nParasInLayout = 0L;
+    sal_Int32 nParasInLayout = 0;
     pPara = rOutliner.GetParagraph( nPara );
     while( pPara && !::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) )
     {
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 9eda921bb7a9..1ee4e3715183 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -385,8 +385,8 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
 
     mrOutliner.SetParaFlag( pPara, ParaFlag::ISPAGE );
     // how many titles are there before the new title paragraph?
-    sal_uLong nExample = 0L;            // position of the "example" page
-    sal_uLong nTarget  = 0L;            // position of insertion
+    sal_uLong nExample = 0;            // position of the "example" page
+    sal_uLong nTarget  = 0;            // position of insertion
     while(pPara)
     {
         pPara = GetPrevTitle(pPara);
@@ -503,7 +503,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, aPa
     if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) )
     {
         // how many titles are in front of the title paragraph in question?
-        sal_uLong nPos = 0L;
+        sal_uLong nPos = 0;
         while(pPara)
         {
             pPara = GetPrevTitle(pPara);
@@ -631,7 +631,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam
         // the paragraph was a page but now becomes a normal paragraph
 
         // how many titles are before the title paragraph in question?
-        sal_uLong nPos = 0L;
+        sal_uLong nPos = 0;
         Paragraph* pParagraph = pPara;
         while(pParagraph)
         {
@@ -680,7 +680,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam
     else if ( (pOutliner->GetPrevDepth() == 1) && ( pOutliner->GetDepth( pOutliner->GetAbsPos( pPara ) ) == 2 ) )
     {
         // how many titles are in front of the title paragraph in question?
-        sal_Int32 nPos = -1L;
+        sal_Int32 nPos = -1;
 
         Paragraph* pParagraph = pPara;
         while(pParagraph)
@@ -700,7 +700,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam
 
     }
     // how many titles are in front of the title paragraph in question?
-    sal_Int32 nPos = -1L;
+    sal_Int32 nPos = -1;
 
     Paragraph* pTempPara = pPara;
     while(pTempPara)
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 193b5a45551f..12bfacf6dff8 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -468,7 +468,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
 /**
  * The event will be forwarded to the View
  */
-void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
+void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0*/)
 {
     // execute ??
     if (mnLockRedrawSmph == 0)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 443515373618..2a6fd8b2c4bc 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -789,7 +789,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
                         long        nNewZoom;
                         Point aOldMousePos = GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel());
 
-                        if( pData->GetDelta() < 0L )
+                        if( pData->GetDelta() < 0 )
                             nNewZoom = std::max( (long) pWin->GetMinZoom(), basegfx::zoomtools::zoomOut( nOldZoom ));
                         else
                             nNewZoom = std::min( (long) pWin->GetMaxZoom(), basegfx::zoomtools::zoomIn( nOldZoom ));