diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 14:45:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 08:14:31 +0200 |
commit | ff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch) | |
tree | 272dfa9af5ead31b61c1be34afcaf4402ff4ad77 /sw/source/filter | |
parent | 224b770fa77fe12ad5dc543ce020aca316b6558d (diff) |
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>
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/html/parcss1.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltble.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 18 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 4 |
8 files changed, 21 insertions, 21 deletions
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()) ); |