remove UL/L suffixes from integer constants in initialiser/call expressions

Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300
Reviewed-on: https://gerrit.libreoffice.org/41214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

22 files changed, 50 insertions, 50 deletions

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index df6455ed33bc..f61c19c2fb29 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3374,7 +3374,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         {
             // First, determine number of anchor text node in the copied range.
             // Note: The anchor text node *have* to be inside the copied range.
-            sal_uLong nAnchorTextNdNumInRange( 0L );
+            sal_uLong nAnchorTextNdNumInRange( 0 );
             bool bAnchorTextNdFound( false );
             SwNodeIndex aIdx( rRg.aStart );
             while ( !bAnchorTextNdFound && aIdx <= rRg.aEnd )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index d3bfb40546e1..b5825827cd26 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -376,7 +376,7 @@ sal_uInt32 SwContact::GetMinOrdNum() const
 /// get maximum order number of anchored objects handled by with contact
 sal_uInt32 SwContact::GetMaxOrdNum() const
 {
-    sal_uInt32 nMaxOrdNum( 0L );
+    sal_uInt32 nMaxOrdNum( 0 );
 
     std::list< SwAnchoredObject* > aObjs;
     GetAnchoredObjs( aObjs );
@@ -1224,8 +1224,8 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
                     // use geometry of drawing object
                     aObjRect = pGroupObj->GetSnapRect();
                 }
-                SwTwips nXPosDiff(0L);
-                SwTwips nYPosDiff(0L);
+                SwTwips nXPosDiff(0);
+                SwTwips nYPosDiff(0);
                 switch ( eLayoutDir )
                 {
                     case SwFrameFormat::HORI_L2R:
@@ -2035,7 +2035,7 @@ namespace sdr
         {
             const sal_uInt32 nSubHierarchyCount(rVOC.GetViewContact().GetObjectCount());
 
-            for(sal_uInt32 a(0L); a < nSubHierarchyCount; a++)
+            for(sal_uInt32 a(0); a < nSubHierarchyCount; a++)
             {
                 const ViewObjectContact& rCandidate(rVOC.GetViewContact().GetViewContact(a).GetViewObjectContact(rVOC.GetObjectContact()));
 
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index d0c7f320dfc7..97015f858a1f 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -72,7 +72,7 @@ SwAnchoredObject::SwAnchoredObject() :
     mpPageFrame( nullptr ),
     maRelPos(),
     maLastCharRect(),
-    mnLastTopOfLine( 0L ),
+    mnLastTopOfLine( 0 ),
     mpVertPosOrientFrame( nullptr ),
     // --> #i28701#
     mbPositioningInProgress( false ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a478de201ac0..b10b65320bd9 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3237,14 +3237,14 @@ SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat
                                     _rNewAnchorFormat.GetContentAnchor()->nNode )
         {
             // determine 'old' number of anchor frames
-            sal_uInt32 nOldNumOfAnchFrame( 0L );
+            sal_uInt32 nOldNumOfAnchFrame( 0 );
             SwIterator<SwFrame,SwContentNode> aOldIter( *(aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrame* pOld = aOldIter.First(); pOld; pOld = aOldIter.Next() )
             {
                 ++nOldNumOfAnchFrame;
             }
             // determine 'new' number of anchor frames
-            sal_uInt32 nNewNumOfAnchFrame( 0L );
+            sal_uInt32 nNewNumOfAnchFrame( 0 );
             SwIterator<SwFrame,SwContentNode> aNewIter( *(_rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) );
             for( SwFrame* pNew = aNewIter.First(); pNew; pNew = aNewIter.Next() )
             {
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d69501935d2c..ac9eab002f8a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2269,7 +2269,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
     if ( pNewUpper &&
          m_rThis.IsTextFrame() && !IsFollow() )
     {
-        sal_uInt32 nToPageNum( 0L );
+        sal_uInt32 nToPageNum( 0 );
         const bool bMoveFwdByObjPos = SwLayouter::FrameMovedFwdByObjPos(
                                                 *(pOldPage->GetFormat()->GetDoc()),
                                                 static_cast<SwTextFrame&>(m_rThis),
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 2543ea147380..1500b96d110b 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -417,7 +417,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext)
                     // #i40444#
                     // #i58182# - usage of new method
                     // <SwObjectFormatterTextFrame::CheckMovedFwdCondition(..)>
-                    sal_uInt32 nToPageNum( 0L );
+                    sal_uInt32 nToPageNum( 0 );
                     bool bDummy( false );
                     if ( SwObjectFormatterTextFrame::CheckMovedFwdCondition(
                                         *this, GetPageFrame()->GetPhyPageNum(),
@@ -428,7 +428,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext)
                         // directly, that it is moved forward by object positioning.
                         SwTextFrame* pAnchorTextFrame( static_cast<SwTextFrame*>(AnchorFrame()) );
                         bool bInsert( true );
-                        sal_uInt32 nAnchorFrameToPageNum( 0L );
+                        sal_uInt32 nAnchorFrameToPageNum( 0 );
                         const SwDoc& rDoc = *(GetFrameFormat().GetDoc());
                         if ( SwLayouter::FrameMovedFwdByObjPos(
                                                 rDoc, *pAnchorTextFrame, nAnchorFrameToPageNum ) )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 5beb864aa1f6..a68462a4cdc7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -719,7 +719,7 @@ SwContentNotify::SwContentNotify( SwContentFrame *pContentFrame ) :
     SwFrameNotify( pContentFrame ),
     // OD 08.01.2004 #i11859#
     mbChkHeightOfLastLine( false ),
-    mnHeightOfLastLine( 0L ),
+    mnHeightOfLastLine( 0 ),
     // OD 2004-02-26 #i25029#
     mbInvalidatePrevPrtArea( false ),
     mbBordersJoinedWithPrev( false )
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 54cb686637e6..3bbffccdc226 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -187,7 +187,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                 if ( pAnchorPageFrame != _rAnchoredObj.GetPageFrame() )
                 {
                     bool bInsert( true );
-                    sal_uInt32 nToPageNum( 0L );
+                    sal_uInt32 nToPageNum( 0 );
                     const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                     if ( SwLayouter::FrameMovedFwdByObjPos(
                                             rDoc, mrAnchorTextFrame, nToPageNum ) )
@@ -221,7 +221,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                         "<SwObjectFormatterTextFrame::DoFormatObj(..)> - anchored object not collected!?" );
                 --nIdx;
 
-                sal_uInt32 nToPageNum( 0L );
+                sal_uInt32 nToPageNum( 0 );
                 // #i43913#
                 bool bDummy( false );
                 // #i58182# - consider new method signature
@@ -233,7 +233,7 @@ bool SwObjectFormatterTextFrame::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     // #i49987# - consider, that anchor frame
                     // could already been marked to move forward.
                     bool bInsert( true );
-                    sal_uInt32 nMovedFwdToPageNum( 0L );
+                    sal_uInt32 nMovedFwdToPageNum( 0 );
                     const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                     if ( SwLayouter::FrameMovedFwdByObjPos(
                                             rDoc, mrAnchorTextFrame, nMovedFwdToPageNum ) )
@@ -347,7 +347,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
         // section the anchor frame is in.
         FormatAnchorFrameForCheckMoveFwd();
 
-        sal_uInt32 nToPageNum( 0L );
+        sal_uInt32 nToPageNum( 0 );
         // #i43913#
         bool bInFollow( false );
         SwAnchoredObject* pObj = nullptr;
@@ -371,7 +371,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
                  bInFollow )
             {
                 bool bInsert( true );
-                sal_uInt32 nTmpToPageNum( 0L );
+                sal_uInt32 nTmpToPageNum( 0 );
                 const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
                 if ( SwLayouter::FrameMovedFwdByObjPos(
                                         rDoc, mrAnchorTextFrame, nTmpToPageNum ) )
@@ -403,7 +403,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
             // #i49987# - consider, that anchor frame
             // could already been marked to move forward.
             bool bInsert( true );
-            sal_uInt32 nMovedFwdToPageNum( 0L );
+            sal_uInt32 nMovedFwdToPageNum( 0 );
             const SwDoc& rDoc = *(GetPageFrame().GetFormat()->GetDoc());
             if ( SwLayouter::FrameMovedFwdByObjPos(
                                     rDoc, mrAnchorTextFrame, nMovedFwdToPageNum ) )
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 023014503d7b..1893feb99a5d 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -477,7 +477,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
             // #i26791# - local variable <nVertOffsetToFrameAnchorPos>
             // for determination of the 'vertical' offset to the frame anchor
             // position
-            SwTwips nVertOffsetToFrameAnchorPos( 0L );
+            SwTwips nVertOffsetToFrameAnchorPos( 0 );
             // #i22341# - add special case for vertical alignment
             // at top of line.
             if ( mbAnchorToChar &&
@@ -814,7 +814,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
                 }
                 else
                 {
-                    SwTwips nTmpRelPosY( 0L );
+                    SwTwips nTmpRelPosY( 0 );
                     if ( aRectFnSet.IsVert() )
                         nTmpRelPosY = aRelPos.X() - nDist;
                     else
@@ -1004,7 +1004,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
                                       : pOrientFrame;
 
         // #i26791# - get 'horizontal' offset to frame anchor position.
-        SwTwips nHoriOffsetToFrameAnchorPos( 0L );
+        SwTwips nHoriOffsetToFrameAnchorPos( 0 );
         SwTwips nRelPosX = CalcRelPosX( *pHoriOrientFrame, aEnvOfObj,
                                          aHori, rLR, rUL, bWrapThrough,
                                          ( aRectFnSet.IsVert() ? aRelPos.X() : aRelPos.Y() ),
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index a228cddf6bae..df3ad4686991 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -80,7 +80,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
             eVertOrient = text::VertOrientation::TOP;
         }
         // #i26791# - get vertical offset to frame anchor position.
-        SwTwips nVertOffsetToFrameAnchorPos( 0L );
+        SwTwips nVertOffsetToFrameAnchorPos( 0 );
         SwTwips nRelPosY =
                 GetVertRelPos( GetAnchorFrame(), GetAnchorFrame(), eVertOrient,
                                 aVert.GetRelationOrient(), aVert.GetPos(),
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index b1c7e195bbf9..cb658e54b0cc 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -101,7 +101,7 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh,
     , rLineInf( rLnInf )
     , nX(0)
     , nRedX(0)
-    , nLineNr( 1L )
+    , nLineNr( 1 )
     , nDivider(0)
     , bGoLeft(false)
     , bLineNum( bLnNm )
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b55b00134da1..a8950e56173b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1879,8 +1879,8 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
 
     // Scaling. Must convert from pixels to twips. We know
     // that VirtualDevices use a DPI of 96.
-    Fraction scaleX = Fraction(contextWidth, 96) * Fraction(1440L) / Fraction(tileWidth);
-    Fraction scaleY = Fraction(contextHeight, 96) * Fraction(1440L) / Fraction(tileHeight);
+    Fraction scaleX = Fraction(contextWidth, 96) * Fraction(1440) / Fraction(tileWidth);
+    Fraction scaleY = Fraction(contextHeight, 96) * Fraction(1440) / Fraction(tileHeight);
     aMapMode.SetScaleX(scaleX);
     aMapMode.SetScaleY(scaleY);
     rDevice.SetMapMode(aMapMode);
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index ed043664ab97..167df7045193 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -334,7 +334,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 bEOF = bEOFSave;
 
                 // first parse the number
-                sTmpBuffer.setLength( 0L );
+                sTmpBuffer.setLength( 0 );
                 do {
                     sTmpBuffer.append( cNextCh );
                     cNextCh = GetNextChar();
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index fe787c421ee8..127f5263f60b 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -636,7 +636,7 @@ namespace sw
                 // in the given PolyPolygon. Anything else which might be thought of
                 // for reducing to a single polygon will just need nore power and
                 // cannot create more correct results.
-                sal_uInt32 nPointCount(0L);
+                sal_uInt32 nPointCount(0);
                 sal_uInt16 a;
 
                 for(a = 0; a < rPolyPoly.Count(); a++)
@@ -651,7 +651,7 @@ namespace sw
                 }
 
                 tools::Polygon aRetval((sal_uInt16)nPointCount);
-                sal_uInt32 nAppendIndex(0L);
+                sal_uInt32 nAppendIndex(0);
 
                 for(a = 0; a < rPolyPoly.Count(); a++)
                 {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2ca149ebc6c7..5d0a42530f51 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -269,7 +269,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
         }
     }
 
-    aTempStrm1.Seek(0L);
+    aTempStrm1.Seek(0);
     for (aItr = aEndCps.begin(), n = 0;aItr != aEndCps.end();++aItr,++n)
     {
         if (aItr->second)
@@ -279,7 +279,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
         }
     }
 
-    aTempStrm2.Seek(0L);
+    aTempStrm2.Seek(0);
     rWrt.WriteAsStringTable(aNames, rWrt.pFib->m_fcSttbfbkmk,rWrt.pFib->m_lcbSttbfbkmk);
     SvStream& rStrm = *rWrt.pTableStrm;
     rWrt.pFib->m_fcPlcfbkf = rStrm.Tell();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9b8795fa63b9..880bb99f79b8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2181,7 +2181,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen,
             "<SwWW8ImplReader::Read_HdFtTextAsHackedFrame(..)> - missing SdrObject instance" );
     if ( pFrameObj )
     {
-        pFrameObj->SetOrdNum( 0L );
+        pFrameObj->SetOrdNum( 0 );
     }
     MoveInsideFly(pFrame);
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c1448caa28f5..2e379537af25 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1935,7 +1935,7 @@ bToggelPos(false)
     //       the left and right border distances are different.
     // no adjustments possible, if frame has automatic width.
     // determine left border distance
-    sal_Int16 nLeBorderMgn( 0L );
+    sal_Int16 nLeBorderMgn( 0 );
     if ( !bAutoWidth )
     {
         WW8_BRCVer9 &rBrc = rWW.brc[WW8_LEFT];
@@ -1943,7 +1943,7 @@ bToggelPos(false)
         nLeBorderMgn = nLeBorderMgn + nTemp;
     }
     // determine right border distance
-    sal_Int16 nRiBorderMgn( 0L );
+    sal_Int16 nRiBorderMgn( 0 );
     if ( !bAutoWidth )
     {
         WW8_BRCVer9 &rBrc = rWW.brc[WW8_RIGHT];
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 448f8a2deaed..391e82d7f9cc 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -74,7 +74,7 @@ public:
 
     explicit SwXMLTableColumn_Impl(sal_uInt32 nPosition)
         : SwWriteTableCol(nPosition)
-        , nRelWidth(0UL)
+        , nRelWidth(0)
     {};
 
     void SetStyleName( const OUString& rName ) { sStyleName = rName; }
@@ -120,7 +120,7 @@ public:
 
 SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     pLines( &rLines ),
-    nWidth( 0UL )
+    nWidth( 0 )
 {
 #if OSL_DEBUG_LEVEL > 0
     sal_uInt32 nEndCPos = 0U;
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 2f339291ed90..a2fcad1b997d 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -441,9 +441,9 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
     m_bHasStringValue(false),
     m_bValueTypeIsString(false),
     bProtect( false ),
-    nRowSpan( 1UL ),
-    nColSpan( 1UL ),
-    nColRepeat( 1UL ),
+    nRowSpan( 1 ),
+    nColSpan( 1 ),
+    nColRepeat( 1 ),
     bHasTextContent( false ),
     bHasTableContent( false )
 {
@@ -1237,9 +1237,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     m_bRelWidth( true ),
     m_bHasSubTables( false ),
     m_nHeaderRows( 0 ),
-    m_nCurRow( 0UL ),
-    m_nCurCol( 0UL ),
-    m_nWidth( 0UL )
+    m_nCurRow( 0 ),
+    m_nCurCol( 0 ),
+    m_nWidth( 0 )
 {
     OUString aName;
     OUString sXmlId;
@@ -1378,9 +1378,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     m_bRelWidth( true ),
     m_bHasSubTables( false ),
     m_nHeaderRows( 0 ),
-    m_nCurRow( 0UL ),
-    m_nCurCol( 0UL ),
-    m_nWidth( 0UL )
+    m_nCurRow( 0 ),
+    m_nCurCol( 0 ),
+    m_nWidth( 0 )
 {
 }
 
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 99e032dd4a42..07e15faad4f6 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -132,10 +132,10 @@ static void lcl_addOutplaceProperties(
 
         if( aSize.Width() && aSize.Height() )
         {
-            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), Any(0L) );
+            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), Any(sal_Int32(0)) );
             pStates++;
 
-            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(0L) );
+            *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(sal_Int32(0)) );
             pStates++;
 
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any((sal_Int32)aSize.Width()) );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index c0c662b9d9aa..eec8f29ab834 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1025,14 +1025,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
                             aTemplateValue >>= sTmpl;
 
                             sal_Int32 nColonPos = sTmpl.indexOf( ':' );
-                            OUString sPrefix = sTmpl.copy( 0L, nColonPos );
+                            OUString sPrefix = sTmpl.copy( 0, nColonPos );
                             if ( sPrefix == "Style" )
                             {
-                                aTemplateName = sTmpl.copy( 7L );   //get string behind "Style: "
+                                aTemplateName = sTmpl.copy( 7 );   //get string behind "Style: "
                             }
                             else if ( sPrefix == "Outline" )
                             {
-                                nTemplateOutlineLevel = ( sTmpl.copy( 15L )).toInt32(); //get string behind "Outline: Leve  ";
+                                nTemplateOutlineLevel = ( sTmpl.copy( 15 )).toInt32(); //get string behind "Outline: Leve  ";
                                 bCreateByOutlineLevel = true;
                             }
 
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index b5f06236d9b9..baedf94d706b 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -59,7 +59,7 @@ SwBezierShell::SwBezierShell(SwView &_rView):
 
     SwWrtShell *pSh = &GetShell();
     SdrView*    pSdrView = pSh->GetDrawView();
-    pSdrView->SetEliminatePolyPointLimitAngle(1500L);
+    pSdrView->SetEliminatePolyPointLimitAngle(1500);
 
     SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Draw));
 }