summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-08 13:49:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-09 07:20:44 +0100
commit75c604a4ecd61322285f4139621e14166a8db1f2 (patch)
tree995ac51e5c7310e310ce096c14784cac6b357ad0 /sot
parentc0847dc7b7a311d19b73d4943d1b0466b10cde4f (diff)
loplugin:convertlong in ucb,sot
Change-Id: I6fa355448834701f11b84584649dfcdecd0f7b2c Reviewed-on: https://gerrit.libreoffice.org/47596 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/stg.cxx8
-rw-r--r--sot/source/sdstor/stgcache.cxx8
-rw-r--r--sot/source/sdstor/stgdir.cxx4
3 files changed, 10 insertions, 10 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 313d2c893840..64583644d7cc 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -316,7 +316,7 @@ bool Storage::IsStorageFile( SvStream* pStream )
if ( pStream )
{
StgHeader aHdr;
- sal_uLong nPos = pStream->Tell();
+ sal_uInt64 nPos = pStream->Tell();
bRet = ( aHdr.Load( *pStream ) && aHdr.Check() );
// It's not a stream error if it is too small for a OLE storage header
@@ -374,7 +374,7 @@ Storage::Storage( SvStream& r, bool bDirect )
if( r.GetError() == ERRCODE_NONE )
{
pIo->SetStrm( &r, false );
- sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 nSize = r.Seek( STREAM_SEEK_TO_END );
r.Seek( 0 );
// Initializing is OK if the stream is empty
Init( nSize == 0 );
@@ -419,7 +419,7 @@ Storage::Storage( UCBStorageStream& rStrm, bool bDirect )
pIo->SetStrm( &rStrm );
- sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 nSize = pStream->Seek( STREAM_SEEK_TO_END );
pStream->Seek( 0 );
// Initializing is OK if the stream is empty
Init( nSize == 0 );
@@ -444,7 +444,7 @@ void Storage::Init( bool bCreate )
OSL_ENSURE( pIo, "The pointer may not be empty at this point!" );
if( pIo->Good() && pIo->GetStrm() )
{
- sal_uLong nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
pIo->GetStrm()->Seek( 0 );
if( nSize )
{
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 8f77abdbc345..3665aac7b856 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -111,8 +111,8 @@ void StgCache::SetPhysPageSize( short n )
if ( n >= 512 )
{
m_nPageSize = n;
- sal_uLong nPos = m_pStrm->Tell();
- sal_uLong nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 nPos = m_pStrm->Tell();
+ sal_uInt64 nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
m_nPages = lcl_GetPageCount( nFileSize, m_nPageSize );
m_pStrm->Seek( nPos );
}
@@ -295,7 +295,7 @@ bool StgCache::Open( const OUString& rName, StreamMode nMode )
SetStrm( pFileStrm, true );
if( pFileStrm->IsOpen() )
{
- sal_uLong nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
m_nPages = lcl_GetPageCount( nFileSize, m_nPageSize );
m_pStrm->Seek( 0 );
}
@@ -384,7 +384,7 @@ bool StgCache::Write( sal_Int32 nPage, void const * pBuf )
{
m_pStrm->Seek(nPos);
}
- sal_uLong nRes = m_pStrm->WriteBytes( pBuf, nBytes );
+ size_t nRes = m_pStrm->WriteBytes( pBuf, nBytes );
if( nRes != nBytes )
SetError( SVSTREAM_WRITE_ERROR );
else
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 309c5f896112..3cad0ee08962 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -625,7 +625,7 @@ bool StgDirEntry::Tmp2Strm()
OSL_ENSURE( m_pStgStrm, "The pointer may not be NULL!" );
if ( !m_pStgStrm )
return false;
- sal_uLong n = m_pTmpStrm->GetSize();
+ sal_uInt64 n = m_pTmpStrm->GetSize();
StgStrm* pNewStrm;
StgIo& rIo = m_pStgStrm->GetIo();
sal_uLong nThreshold = (sal_uLong) rIo.m_aHdr.GetThreshold();
@@ -639,7 +639,7 @@ bool StgDirEntry::Tmp2Strm()
m_pTmpStrm->Seek( 0 );
while( n )
{
- sal_uLong nn = n;
+ sal_uInt64 nn = n;
if( nn > 4096 )
nn = 4096;
if (m_pTmpStrm->ReadBytes( p, nn ) != nn)