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 /sot/source | |
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 'sot/source')
-rw-r--r-- | sot/source/sdstor/stg.cxx | 8 | ||||
-rw-r--r-- | sot/source/sdstor/stgdir.cxx | 16 | ||||
-rw-r--r-- | sot/source/sdstor/stgelem.cxx | 4 | ||||
-rw-r--r-- | sot/source/sdstor/stgole.cxx | 6 | ||||
-rw-r--r-- | sot/source/sdstor/stgstrms.cxx | 6 | ||||
-rw-r--r-- | sot/source/sdstor/storage.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 4 |
7 files changed, 23 insertions, 23 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index e744a357d351..a668917cfd13 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -154,7 +154,7 @@ bool OLEStorageBase::ValidateMode_Impl( StreamMode m, StgDirEntry* p ) StorageStream::StorageStream( StgIo* p, StgDirEntry* q, StreamMode m ) - : OLEStorageBase( p, q, m_nMode ), nPos( 0L ) + : OLEStorageBase( p, q, m_nMode ), nPos( 0 ) { // The dir entry may be 0; this means that the stream is invalid. if( q && p ) @@ -375,7 +375,7 @@ Storage::Storage( SvStream& r, bool bDirect ) { pIo->SetStrm( &r, false ); sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END ); - r.Seek( 0L ); + r.Seek( 0 ); // Initializing is OK if the stream is empty Init( nSize == 0 ); if( pEntry ) @@ -420,7 +420,7 @@ Storage::Storage( UCBStorageStream& rStrm, bool bDirect ) pIo->SetStrm( &rStrm ); sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END ); - pStream->Seek( 0L ); + pStream->Seek( 0 ); // Initializing is OK if the stream is empty Init( nSize == 0 ); if( pEntry ) @@ -445,7 +445,7 @@ void Storage::Init( bool bCreate ) if( pIo->Good() && pIo->GetStrm() ) { sal_uLong nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END ); - pIo->GetStrm()->Seek( 0L ); + pIo->GetStrm()->Seek( 0 ); if( nSize ) { bHdrLoaded = pIo->Load(); diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index 952fd3879683..7bcae2f707c8 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -269,7 +269,7 @@ void StgDirEntry::OpenStream( StgIo& rIo ) if( m_bInvalid && m_aEntry.GetSize() ) { // This entry has invalid data, so delete that data - SetSize( 0L ); + SetSize( 0 ); // bRemoved = bInvalid = false; } m_nPos = 0; @@ -355,8 +355,8 @@ bool StgDirEntry::SetSize( sal_Int32 nNewSize ) if( nOldSize ) { std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nOldSize ]); - pOld->Pos2Page( 0L ); - m_pStgStrm->Pos2Page( 0L ); + pOld->Pos2Page( 0 ); + m_pStgStrm->Pos2Page( 0 ); if( pOld->Read( pBuf.get(), nOldSize ) && m_pStgStrm->Write( pBuf.get(), nOldSize ) ) bRes = true; @@ -500,8 +500,8 @@ void StgDirEntry::Copy( BaseStorageStream& rDest ) sal_uLong Pos = rDest.Tell(); sal_uInt8 aTempBytes[ 4096 ]; void* p = static_cast<void*>( aTempBytes ); - Seek( 0L ); - rDest.Seek( 0L ); + Seek( 0 ); + rDest.Seek( 0 ); while( n ) { sal_Int32 nn = n; @@ -576,7 +576,7 @@ bool StgDirEntry::Strm2Tmp() sal_uInt8 aTempBytes[ 4096 ]; void* p = static_cast<void*>( aTempBytes ); - m_pStgStrm->Pos2Page( 0L ); + m_pStgStrm->Pos2Page( 0 ); while( n ) { sal_uLong nn = n; @@ -636,7 +636,7 @@ bool StgDirEntry::Tmp2Strm() if( pNewStrm->SetSize( n ) ) { sal_uInt8 p[ 4096 ]; - m_pTmpStrm->Seek( 0L ); + m_pTmpStrm->Seek( 0 ); while( n ) { sal_uLong nn = n; @@ -657,7 +657,7 @@ bool StgDirEntry::Tmp2Strm() } else { - m_pStgStrm->SetSize( 0L ); + m_pStgStrm->SetSize( 0 ); delete m_pStgStrm; m_pStgStrm = pNewStrm; pNewStrm->SetEntry( *this ); diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 0fb80c4a36cc..4e18d0e1b4d0 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -129,7 +129,7 @@ bool StgHeader::Load( StgIo& rIo ) bool StgHeader::Load( SvStream& r ) { - r.Seek( 0L ); + r.Seek( 0 ); r.ReadBytes( m_cSignature, 8 ); ReadClsId( r, m_aClsId ); // 08 Class ID r.ReadInt32( m_nVersion ) // 1A version number @@ -157,7 +157,7 @@ bool StgHeader::Store( StgIo& rIo ) return true; SvStream& r = *rIo.GetStrm(); - r.Seek( 0L ); + r.Seek( 0 ); r.WriteBytes( m_cSignature, 8 ); WriteClsId( r, m_aClsId ); // 08 Class ID r.WriteInt32( m_nVersion ) // 1A version number diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index a00e706e38de..8b5a8dbca478 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -107,7 +107,7 @@ bool StgCompObjStream::Load() m_aUserName.clear(); if( GetError() != ERRCODE_NONE ) return false; - Seek( 8L ); // skip the first part + Seek( 8 ); // skip the first part sal_Int32 nMarker = 0; ReadInt32( nMarker ); if( nMarker == -1L ) @@ -144,7 +144,7 @@ bool StgCompObjStream::Store() { if( GetError() != ERRCODE_NONE ) return false; - Seek( 0L ); + Seek( 0 ); OString aAsciiUserName(OUStringToOString(m_aUserName, RTL_TEXTENCODING_MS_1252)); WriteInt16( 1 ); // Version? WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator @@ -172,7 +172,7 @@ bool StgOleStream::Store() if( GetError() != ERRCODE_NONE ) return false; - Seek( 0L ); + Seek( 0 ); WriteInt32( 0x02000001 ); // OLE version, format WriteInt32( 0 ); // Object flags WriteInt32( 0 ); // Update Options diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 4e957d3e9355..a60b13db55b7 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1145,8 +1145,8 @@ bool StgTmpStrm::Copy( StgTmpStrm& rSrc ) if( GetError() == ERRCODE_NONE ) { std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]); - rSrc.Seek( 0L ); - Seek( 0L ); + rSrc.Seek( 0 ); + Seek( 0 ); while( n ) { const sal_uInt64 nn = std::min<sal_uInt64>(n, 4096); @@ -1204,7 +1204,7 @@ void StgTmpStrm::SetSize(sal_uInt64 n) std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]); if( i ) { - Seek( 0L ); + Seek( 0 ); while( i ) { const sal_uInt64 nb = std::min<sal_uInt64>(i, 4096); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 13e6c7d08ab4..4445872b5f2b 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -199,7 +199,7 @@ void SotStorageStream::CopyTo( SotStorageStream * pDestStm ) { // If Ole2 or not only own StorageStreams sal_uLong nPos = Tell(); // save position - Seek( 0L ); + Seek( 0 ); pDestStm->SetSize( 0 ); // empty target stream std::unique_ptr<sal_uInt8[]> pMem(new sal_uInt8[ 8192 ]); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 55e4920d9ac6..f67d68666fee 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1332,8 +1332,8 @@ void UCBStorageStream::CopyTo( BaseStorageStream* pDestStm ) if( pDestStm->SetSize( n ) && n ) { std::unique_ptr<sal_uInt8[]> p(new sal_uInt8[ 4096 ]); - Seek( 0L ); - pDestStm->Seek( 0L ); + Seek( 0 ); + pDestStm->Seek( 0 ); while( n ) { sal_uInt32 nn = n; |