tdf#96505 Deleted suffix long (L) where it is possible

Change-Id: Iafe5ea3822f7f0170d2fb041fea604e95dbfa015
Reviewed-on: https://gerrit.libreoffice.org/46041
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>

26 files changed, 64 insertions, 66 deletions

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 226609ab668e..f4a8138d1ed8 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -85,7 +85,7 @@ const SwTwips lMinBorder = 1134;
 // Margin left and above document.
 // Half of it is gap between the pages.
 //TODO: Replace with SwViewOption::defDocumentBorder
-#define DOCUMENTBORDER  284L
+#define DOCUMENTBORDER  284
 
 // Constant strings.
 SW_DLLPUBLIC extern OUString aEmptyOUStr;  // remove once aEmptyOUStr can be changed to OUString
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a865b4184ee5..6e8f4b7d9511 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -643,12 +643,12 @@ public:
 
 inline long SwView::GetXScroll() const
 {
-    return m_aVisArea.GetWidth() * nScrollX / 100L;
+    return (m_aVisArea.GetWidth() * nScrollX) / 100;
 }
 
 inline long SwView::GetYScroll() const
 {
-    return m_aVisArea.GetHeight() * nScrollY / 100L;
+    return (m_aVisArea.GetHeight() * nScrollY) / 100;
 }
 
 inline const SwDocShell *SwView::GetDocShell() const
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 825ba6be7cf0..fa143dad4e4b 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -50,8 +50,6 @@
 
 #include <bordertest.hxx>
 
-#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36)/72L) : (((TWIP)*127L-36)/72L))
-
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index a8c0b6457594..ef12474832f2 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -73,7 +73,7 @@ OUString SwDateTimeField::Expand() const
         fVal = GetValue();
 
     if (nOffset)
-        fVal += (double)(nOffset * 60L) / 86400.0;
+        fVal += nOffset * ( 60 / 86400.0 );
 
     return ExpandValue(fVal, GetFormat(), GetLanguage());
 }
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index b44ab3494cd1..ee377c50c6fd 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -720,8 +720,8 @@ inline void SwSubFont::SetSize( const Size& rSize )
     else
     {
         Font::SetFontSize( Size(
-            m_aSize.Width() * GetPropr() / 100L,
-            m_aSize.Height() * GetPropr() / 100L ) );
+            m_aSize.Width() * GetPropr() / 100,
+            m_aSize.Height() * GetPropr() / 100 ) );
     }
     m_pMagic = nullptr;
 }
@@ -749,8 +749,8 @@ inline void SwFont::SetActual( SwFontScript nNew )
 inline void SwSubFont::SetProportion( const sal_uInt8 nNewPropr )
 {
     m_pMagic = nullptr;
-    Font::SetFontSize( Size( m_aSize.Width() * nNewPropr / 100L,
-                             m_aSize.Height() * nNewPropr / 100L ) );
+    Font::SetFontSize( Size( m_aSize.Width() * nNewPropr / 100,
+                             m_aSize.Height() * nNewPropr / 100 ) );
     SvxFont::SetPropr( nNewPropr );
 }
 
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c87f952ff5cb..f0bb198cb57f 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1765,7 +1765,7 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst )
             nDist = LONG_MAX - nSize;
 
         if ( nDist <= 0 )
-            return 0L;
+            return 0;
 
         if ( Lower()->IsColumnFrame() )
         {   // If it's a Column Frame, the Format takes control of the
@@ -1777,7 +1777,7 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst )
                 InvalidatePos_();
                 InvalidateSize();
             }
-            return 0L;
+            return 0;
         }
 
         if ( !bTst )
@@ -1832,7 +1832,7 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst )
         }
         return nDist;
     }
-    return 0L;
+    return 0;
 }
 
 SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst )
@@ -1854,7 +1854,7 @@ SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst )
         }
 
         if ( nVal <= 0 )
-            return 0L;
+            return 0;
 
         if ( Lower()->IsColumnFrame() )
         {   // If it's a Column Frame, the Format takes control of the
@@ -1888,7 +1888,7 @@ SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst )
                 if ( GetAnchorFrame()->IsInFly() )
                     AnchorFrame()->FindFlyFrame()->Shrink( nDist, bTst );
             }
-            return 0L;
+            return 0;
         }
 
         if ( !bTst )
@@ -1944,7 +1944,7 @@ SwTwips SwFlyFrame::Shrink_( SwTwips nDist, bool bTst )
         }
         return nVal;
     }
-    return 0L;
+    return 0;
 }
 
 Size SwFlyFrame::ChgSize( const Size& aNewSize )
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index eb9212d3fff8..004a7b65b3a9 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -306,7 +306,7 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool )
             nDist = std::min( nDist, pBoss->GetMaxFootnoteHeight()
                          - aRectFnSet.GetHeight(getFrameArea()) );
             if ( nDist <= 0 )
-                return 0L;
+                return 0;
         }
         // FootnoteBoss also influences the max value
         if( !IsInSct() )
@@ -315,7 +315,7 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool )
             if ( nDist > nMax )
                 nDist = nMax;
             if ( nDist <= 0 )
-                return 0L;
+                return 0;
         }
     }
     else if( nDist > aRectFnSet.GetHeight(GetPrev()->getFrameArea()) )
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 43cd7fc94e56..a821eb5b10c4 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -487,7 +487,7 @@ SwAnchoredObject* SwObjectFormatter::GetCollectedObj( const sal_uInt32 _nIndex )
 */
 sal_uInt32 SwObjectFormatter::GetPgNumOfCollected( const sal_uInt32 _nIndex )
 {
-    return mpPgNumAndTypeOfAnchors ? mpPgNumAndTypeOfAnchors->GetPageNum(_nIndex) : 0L;
+    return mpPgNumAndTypeOfAnchors ? mpPgNumAndTypeOfAnchors->GetPageNum(_nIndex) : 0;
 }
 
 /** accessor to 'anchor' type of collected anchored object
@@ -506,7 +506,7 @@ bool SwObjectFormatter::IsCollectedAnchoredAtMaster( const sal_uInt32 _nIndex )
 */
 sal_uInt32 SwObjectFormatter::CountOfCollected()
 {
-    return mpPgNumAndTypeOfAnchors ? mpPgNumAndTypeOfAnchors->Count() : 0L;
+    return mpPgNumAndTypeOfAnchors ? mpPgNumAndTypeOfAnchors->Count() : 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 0e9e657933a8..f939b216e6d9 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2021,7 +2021,7 @@ SwTwips SwSectionFrame::Grow_( SwTwips nDist, bool bTst )
             nDist = LONG_MAX - nFrameHeight;
 
         if ( nDist <= 0 )
-            return 0L;
+            return 0;
 
         bool bInCalcContent = GetUpper() && IsInFly() && FindFlyFrame()->IsLocked();
         // OD 2004-03-15 #116561# - allow grow in online layout
@@ -2134,7 +2134,7 @@ SwTwips SwSectionFrame::Grow_( SwTwips nDist, bool bTst )
                 InvalidateSize();
         }
     }
-    return 0L;
+    return 0;
 }
 
 SwTwips SwSectionFrame::Shrink_( SwTwips nDist, bool bTst )
@@ -2224,7 +2224,7 @@ SwTwips SwSectionFrame::Shrink_( SwTwips nDist, bool bTst )
             }
         }
     }
-    return 0L;
+    return 0;
 }
 
 /*
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0a8dd42e7079..ee1af4668c5b 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4458,7 +4458,7 @@ SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
     if( HasFixSize() )
     {
         AdjustCells( aRectFnSet.GetHeight(getFramePrintArea()), true );
-        return 0L;
+        return 0;
     }
 
     // bInfo may be set to true by SwRowFrame::Format; we need to handle this
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index f26626d7d746..1532dd99f61e 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1468,7 +1468,7 @@ SwTwips SwFrame::Grow( SwTwips nDist, bool bTst, bool bInfo )
             return nReal;
         }
     }
-    return 0L;
+    return 0;
 }
 
 SwTwips SwFrame::Shrink( SwTwips nDist, bool bTst, bool bInfo )
@@ -1509,7 +1509,7 @@ SwTwips SwFrame::Shrink( SwTwips nDist, bool bTst, bool bInfo )
             return nReal;
         }
     }
-    return 0L;
+    return 0;
 }
 
 /** Adjust surrounding neighbourhood after insertion
@@ -1537,7 +1537,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
     PROTOCOL_ENTER( this, PROT::AdjustN, DbgAction::NONE, &nDiff );
 
     if ( !nDiff || !GetUpper()->IsFootnoteBossFrame() ) // only inside pages/columns
-        return 0L;
+        return 0;
 
     const SwViewShell *pSh = getRootFrame()->GetCurrShell();
     const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -1547,7 +1547,7 @@ SwTwips SwFrame::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
     if ( IsPageBodyFrame() && (!bBrowse ||
           (static_cast<SwLayoutFrame*>(this)->Lower() &&
            static_cast<SwLayoutFrame*>(this)->Lower()->IsColumnFrame())) )
-        return 0L;
+        return 0;
 
     //In BrowseView mode the PageFrame can handle some of the requests.
     long nBrowseAdd = 0;
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 94afc9ddc38d..b1296b5eec13 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -146,7 +146,7 @@ const SwRect* SwAnchoredObjectPosition::ToCharRect() const
 // #i22341#
 SwTwips SwAnchoredObjectPosition::ToCharTopOfLine() const
 {
-    return 0L;
+    return 0;
 }
 
 /** helper method to determine top of a frame for the vertical
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index eec6e4a85073..042a97fc53fa 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -26,9 +26,9 @@
 #include "porlay.hxx"
 
 // Visible time
-#define BLINK_ON_TIME       2400L
+#define BLINK_ON_TIME       2400
 // Invisible time
-#define BLINK_OFF_TIME      800L
+#define BLINK_OFF_TIME      800
 
 /**
  * pBlink points to the instance where blinking portions need to register.
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index e92c7562cea8..eddc2054fac9 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -470,7 +470,7 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
         DFLT_ESC_AUTO_SUB != GetEscapement() )
     {
         const long nAscent = nOldAscent +
-                             ( (long) m_nOrgHeight * GetEscapement() ) / 100L;
+                             ( (long) m_nOrgHeight * GetEscapement() ) / 100;
         if ( nAscent>0 )
             return std::max<sal_uInt16>( nAscent, m_nOrgAscent );
     }
@@ -992,7 +992,7 @@ sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight,
         DFLT_ESC_AUTO_SUB != GetEscapement() )
     {
         long nDescent = nOldHeight - nOldAscent -
-                             ( (long) m_nOrgHeight * GetEscapement() ) / 100L;
+                             ( (long) m_nOrgHeight * GetEscapement() ) / 100;
         const sal_uInt16 nDesc = nDescent>0
                 ? std::max<sal_uInt16>( nDescent, m_nOrgHeight - m_nOrgAscent)
                 : m_nOrgHeight - m_nOrgAscent;
@@ -1418,7 +1418,7 @@ void SwSubFont::CalcEsc( SwDrawTextInfo const & rInf, Point& rPos )
 
         break;
     default :
-        nOfst = ((long)m_nOrgHeight * GetEscapement()) / 100L;
+        nOfst = ((long)m_nOrgHeight * GetEscapement()) / 100;
 
         switch ( nDir )
         {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 59c64b82d9fc..791ec265b0bd 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2344,8 +2344,8 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement)
      *                      100%                       Escapement
      */
 
-    m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000L);
-    // 500L to round !!
+    m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000);
+    // 500 to round !!
 }
 
 void RtfAttributeOutput::CharFont(const SvxFontItem& rFont)
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 334ffe984a02..36e8adb98f8a 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -587,8 +587,8 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly,
     }
     using namespace sw::types;
     // set xExt & yExt
-    Set_UInt16(pArr, msword_cast<sal_uInt16>(aGrTwipSz.Width() * 254L / 144));
-    Set_UInt16(pArr, msword_cast<sal_uInt16>(aGrTwipSz.Height() * 254L / 144));
+    Set_UInt16(pArr, msword_cast<sal_uInt16>(convertTwipToMm100(aGrTwipSz.Width())));
+    Set_UInt16(pArr, msword_cast<sal_uInt16>(convertTwipToMm100(aGrTwipSz.Height())));
     pArr += 16;
     // skip hMF & rcWinMF
     // set dxaGoal & dyaGoal
@@ -712,7 +712,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf,
 
     Set_UInt16( pArr, mm );                         // set mm
 
-    if ( (aGrTwipSz.Width() * 254L / 144 > USHRT_MAX) || (aGrTwipSz.Height()  * 254L / 144 > USHRT_MAX)
+    if ( (convertTwipToMm100(aGrTwipSz.Width()) > USHRT_MAX ) || ( convertTwipToMm100(aGrTwipSz.Height()) > USHRT_MAX )
         || (aGrTwipSz.Width() < 0 ) || (aGrTwipSz.Height() < 0) )
     {
         aGrTwipSz.Width() = nWidth;
@@ -720,8 +720,8 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf,
     }
     using namespace sw::types;
     // set xExt & yExt
-    Set_UInt16(pArr, msword_cast<sal_uInt16>(aGrTwipSz.Width() * 254L / 144));
-    Set_UInt16(pArr, msword_cast<sal_uInt16>(aGrTwipSz.Height() * 254L / 144));
+    Set_UInt16(pArr, msword_cast<sal_uInt16>(convertTwipToMm100(aGrTwipSz.Width())));
+    Set_UInt16(pArr, msword_cast<sal_uInt16>(convertTwipToMm100(aGrTwipSz.Height())));
     pArr += 16;
     // skip hMF & rcWinMF
     // set dxaGoal & dyaGoal
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c6d829c4c915..696826550e3d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -678,10 +678,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
             }
 
             // Distance of Textbox to its surrounding Autoshape
-            sal_Int32 nTextLeft = GetPropertyValue( DFF_Prop_dxTextLeft, 91440L);
-            sal_Int32 nTextRight = GetPropertyValue( DFF_Prop_dxTextRight, 91440L );
-            sal_Int32 nTextTop = GetPropertyValue( DFF_Prop_dyTextTop, 45720L  );
-            sal_Int32 nTextBottom = GetPropertyValue( DFF_Prop_dyTextBottom, 45720L );
+            sal_Int32 nTextLeft = GetPropertyValue( DFF_Prop_dxTextLeft, 91440);
+            sal_Int32 nTextRight = GetPropertyValue( DFF_Prop_dxTextRight, 91440 );
+            sal_Int32 nTextTop = GetPropertyValue( DFF_Prop_dyTextTop, 45720 );
+            sal_Int32 nTextBottom = GetPropertyValue( DFF_Prop_dyTextBottom, 45720 );
 
             ScaleEmu( nTextLeft );
             ScaleEmu( nTextRight );
@@ -976,13 +976,13 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
         }
 
         pImpRec->nDxWrapDistLeft = GetPropertyValue(
-                                    DFF_Prop_dxWrapDistLeft, 114935L ) / 635L;
+                                    DFF_Prop_dxWrapDistLeft, 114935 ) / 635;
         pImpRec->nDyWrapDistTop = GetPropertyValue(
-                                    DFF_Prop_dyWrapDistTop, 0 ) / 635L;
+                                    DFF_Prop_dyWrapDistTop, 0 ) / 635;
         pImpRec->nDxWrapDistRight = GetPropertyValue(
-                                    DFF_Prop_dxWrapDistRight, 114935L ) / 635L;
+                                    DFF_Prop_dxWrapDistRight, 114935 ) / 635;
         pImpRec->nDyWrapDistBottom = GetPropertyValue(
-                                    DFF_Prop_dyWrapDistBottom, 0 ) / 635L;
+                                    DFF_Prop_dyWrapDistBottom, 0 ) / 635;
         // 16.16 fraction times total image width or height, as appropriate.
 
         if (SeekToContent(DFF_Prop_pWrapPolygonVertices, rSt))
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 28bb9fd072b7..e82e241f6725 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4754,9 +4754,9 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex)
                 sal_uInt32 nRed = aForeColor.GetRed() * nWW8BrushStyle;
                 sal_uInt32 nGreen = aForeColor.GetGreen() * nWW8BrushStyle;
                 sal_uInt32 nBlue = aForeColor.GetBlue() * nWW8BrushStyle;
-                nRed += aBackColor.GetRed()  * (1000L - nWW8BrushStyle);
-                nGreen += aBackColor.GetGreen()* (1000L - nWW8BrushStyle);
-                nBlue += aBackColor.GetBlue() * (1000L - nWW8BrushStyle);
+                nRed += aBackColor.GetRed()  * (1000 - nWW8BrushStyle);
+                nGreen += aBackColor.GetGreen()* (1000 - nWW8BrushStyle);
+                nBlue += aBackColor.GetBlue() * (1000 - nWW8BrushStyle);
 
                 aColor.SetColor( RGB_COLORDATA( nRed/1000, nGreen/1000,
                     nBlue/1000 ) );
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 2e6e16c092f6..db1c05bd06c1 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4312,7 +4312,7 @@ void WW8PLCFx_Book::advance()
         else
         {
             const void * p = pBook[0]->GetData(pBook[0]->GetIdx());
-            long nPairFor = (p == nullptr)? 0L : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
+            long nPairFor = (p == nullptr) ? 0 : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
             if (nPairFor == pBook[1]->GetIdx())
                 nIsEnd = 0;
             else
@@ -4555,7 +4555,7 @@ void WW8PLCFx_AtnBook::advance()
         else
         {
             const void * p = m_pBook[0]->GetData(m_pBook[0]->GetIdx());
-            long nPairFor = (p == nullptr)? 0L : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
+            long nPairFor = (p == nullptr) ? 0 : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
             if (nPairFor == m_pBook[1]->GetIdx())
                 m_bIsEnd = false;
             else
@@ -4687,7 +4687,7 @@ void WW8PLCFx_FactoidBook::advance()
         else
         {
             const void * p = m_pBook[0]->GetData(m_pBook[0]->GetIdx());
-            long nPairFor = (p == nullptr)? 0L : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
+            long nPairFor = (p == nullptr) ? 0 : SVBT16ToShort(*static_cast<SVBT16 const *>(p));
             if (nPairFor == m_pBook[1]->GetIdx())
                 m_bIsEnd = false;
             else
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index d2ab2ce96c8d..abe24490f64b 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -82,8 +82,8 @@ struct StringIdPair_Impl
     SvxSwFramePosString::StringId eVert;
 };
 
-#define MAX_PERCENT_WIDTH   254L
-#define MAX_PERCENT_HEIGHT  254L
+#define MAX_PERCENT_WIDTH   254
+#define MAX_PERCENT_HEIGHT  254
 
 enum class LB {
     NONE                = 0x00000000L,
@@ -2698,8 +2698,8 @@ void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
     if (!aGrfSize.Width() && !aGrfSize.Height())
         aGrfSize = rRenderContext.PixelToLogic(aBmp.GetSizePixel());
 
-    long nRelGrf = aGrfSize.Width() * 100L / aGrfSize.Height();
-    long nRelWin = aPntSz.Width() * 100L / aPntSz.Height();
+    long nRelGrf = aGrfSize.Width() * 100 / aGrfSize.Height();
+    long nRelWin = aPntSz.Width() * 100 / aPntSz.Height();
     if (nRelGrf < nRelWin)
     {
         const long nWidth = aPntSz.Width();
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 6fb3b0b6b126..34e72dcc552c 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -421,8 +421,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
 
         // Overwrite defaults!
         aMgr.GetAttrSet().Put( SvxBoxItem(RES_BOX) );
-        aMgr.SetULSpace( 0L, 0L );
-        aMgr.SetLRSpace( 0L, 0L );
+        aMgr.SetULSpace( 0, 0 );
+        aMgr.SetLRSpace( 0, 0 );
 
         // Sender
         if (rItem.m_bSend)
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 1f8f1d775f11..8888531bca41 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -343,7 +343,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
             {
                 sal_Int32 nParaCount = pOutliner->GetParagraphCount();
                 if (nParaCount > 0)
-                    pOLV->SelectRange(0L, nParaCount );
+                    pOLV->SelectRange(0, nParaCount );
             }
             break;
         }
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 782560af5aee..48e466396f11 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -412,7 +412,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
             {
                 sal_Int32 nParaCount = pOutliner->GetParagraphCount();
                 if (nParaCount > 0)
-                    pOLV->SelectRange(0L, nParaCount );
+                    pOLV->SelectRange(0, nParaCount );
             }
         }
         break;
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index e54def7c5d2b..aa65ab2544c1 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1396,7 +1396,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                         const Size& rEditSize = GetEditWin().GetOutputSizePixel();
                         const Size aWindowSize( GetEditWin().PixelToLogic( rEditSize, aTmpMap ) );
 
-                        const long nOf = pVOpt->GetDocumentBorder() * 2L;
+                        const long nOf = pVOpt->GetDocumentBorder() * 2;
                         long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width();
                         nTmpWidth += nOf;
                         aPageSize.Height() += nOf;
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index db352d2912f4..ecb8c26bf895 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -118,7 +118,7 @@ void SwView::SetZoom_( const Size &rEditSize, SvxZoomType eZoomType,
         }
         else if(SvxZoomType::WHOLEPAGE == eZoomType || SvxZoomType::PAGEWIDTH == eZoomType )
         {
-            const long nOf = DOCUMENTBORDER * 2L;
+            const long nOf = DOCUMENTBORDER * 2;
             long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width();
             nTmpWidth += nOf;
             aPageSize.Height() += nOf;
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index cdad0962be46..c134967234f9 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -1168,7 +1168,7 @@ bool SwView::UpdateScrollbars()
         }
 
         Size aTmpSz( m_aDocSz );
-        const long lOfst = bBorder ? 0 : DOCUMENTBORDER * 2L;
+        const long lOfst = bBorder ? 0 : DOCUMENTBORDER * 2;
         aTmpSz.Width() += lOfst; aTmpSz.Height() += lOfst;
 
         {