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)

10 files changed, 12 insertions, 12 deletions

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 54cb77bafedc..e56b10c95dea 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6020,7 +6020,7 @@ void ScDocument::StylesToNames()
 
 sal_uLong ScDocument::GetCellCount() const
 {
-    sal_uLong nCellCount = 0L;
+    sal_uLong nCellCount = 0;
 
     TableContainer::const_iterator it = maTabs.begin();
     for (; it != maTabs.end(); ++it)
@@ -6032,7 +6032,7 @@ sal_uLong ScDocument::GetCellCount() const
 
 sal_uLong ScDocument::GetFormulaGroupCount() const
 {
-    sal_uLong nFormulaGroupCount = 0L;
+    sal_uLong nFormulaGroupCount = 0;
 
     ScFormulaGroupIterator aIter( const_cast<ScDocument*>(this) );
     for ( sc::FormulaGroupEntry* ptr = aIter.first(); ptr; ptr = aIter.next())
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index f8a670d3f477..436b60561808 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -316,7 +316,7 @@ sal_uInt16 XclTools::GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth )
 
 double XclTools::GetXclDefColWidthCorrection( long nXclDefFontHeight )
 {
-    return 40960.0 / ::std::max( nXclDefFontHeight - 15L, 60L ) + 50.0;
+    return 40960.0 / ::std::max( nXclDefFontHeight - 15, 60L ) + 50.0;
 }
 
 // formatting
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index 5e30fb56ad09..91a201aff0ab 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -233,7 +233,7 @@ FltError ImportLotus::Read(SvStream& rIn)
     bool            bRead = true;
     sal_uInt16          nOp;
     sal_uInt16          nRecLen;
-    sal_uInt32          nNextRec = 0UL;
+    sal_uInt32          nNextRec = 0;
     FltError        eRet = eERR_OK;
 
     nTab = 0;
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 39ab0c4817df..8d7fb9499286 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -293,7 +293,7 @@ static sal_Int32 lcl_GetRulerPos( sal_Int32 nApiPos )
         nApiLimit = lcl_GetApiPos( nExp );
     }
     sal_Int32 nRelPos = nApiPos - nApiBase;
-    return nRulerPos + nRelPos / nDiv * 10 + ::std::max( nRelPos % nDiv - nDiv + 10L, 0L );
+    return nRulerPos + nRelPos / nDiv * 10 + ::std::max<sal_Int32>( nRelPos % nDiv - nDiv + 10, 0 );
 }
 
 /** Expands the sequence's size and returns the base index of the new inserted elements. */
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index cc0aaf972e61..48ab51194881 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -147,7 +147,7 @@ void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
 {
     float fScaleFactor = mpOutDev->GetDPIScaleFactor();
 
-    long nMaxSize = 18L * fScaleFactor; // Button max size in either dimension
+    long nMaxSize = 18 * fScaleFactor; // Button max size in either dimension
 
     long nW = std::min(maSize.getWidth() / 2, nMaxSize);
     long nH = std::min(maSize.getHeight(),    nMaxSize);
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index f70aec78e579..9a33e4bd999f 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -181,7 +181,7 @@ sal_Int32 ScCsvControl::GetVisPosCount() const
 
 sal_Int32 ScCsvControl::GetMaxPosOffset() const
 {
-    return std::max( GetPosCount() - GetVisPosCount() + 2L, 0L );
+    return std::max<sal_Int32>( GetPosCount() - GetVisPosCount() + 2, 0 );
 }
 
 bool ScCsvControl::IsValidSplitPos( sal_Int32 nPos ) const
@@ -231,7 +231,7 @@ sal_Int32 ScCsvControl::GetLastVisLine() const
 
 sal_Int32 ScCsvControl::GetMaxLineOffset() const
 {
-    return std::max( GetLineCount() - GetVisLineCount() + 1L, 0L );
+    return std::max<sal_Int32>( GetLineCount() - GetVisLineCount() + 1, 0 );
 }
 
 bool ScCsvControl::IsValidLine( sal_Int32 nLine ) const
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 2a26cc9b8cd9..f7b3d6e7664a 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -196,7 +196,7 @@ sal_Int32 ScCsvGrid::GetNoScrollCol( sal_Int32 nPos ) const
             sal_Int32 nScroll = (GetFirstVisPos() > 0) ? CSV_SCROLL_DIST : 0;
             nNewPos = GetFirstVisPos() + nScroll;
         }
-        else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1L )
+        else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1 )
         {
             sal_Int32 nScroll = (GetFirstVisPos() < GetMaxPosOffset()) ? CSV_SCROLL_DIST : 0;
             nNewPos = GetLastVisPos() - nScroll - 1;
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index c0b5b197d68c..62abb23ac91c 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -256,7 +256,7 @@ sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const
             sal_Int32 nScroll = (GetFirstVisPos() > 0) ? CSV_SCROLL_DIST : 0;
             nNewPos = std::max( nPos, GetFirstVisPos() + nScroll );
         }
-        else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1L )
+        else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1 )
         {
             sal_Int32 nScroll = (GetFirstVisPos() < GetMaxPosOffset()) ? CSV_SCROLL_DIST : 0;
             nNewPos = std::min( nNewPos, GetLastVisPos() - nScroll - sal_Int32( 1 ) );
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index d76b1ef7c9d9..043a421454df 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -79,7 +79,7 @@ namespace {
         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/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 4283785c4fb7..228f087e8790 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -614,7 +614,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
         {
             if(bLayoutRTL)
             {
-                aDrawingRectPixel.Left() = 0L;
+                aDrawingRectPixel.Left() = 0;
             }
             else
             {