diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-29 11:46:47 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-29 11:50:30 +0100 |
commit | 3e71c1068a4691f19bef94b225770488aaa80390 (patch) | |
tree | 4692a5fd8c41fcf92095e995c9cc6943ef76aadb /sot | |
parent | 937d3d65b1fc52c821f67a618fad637ff7590d8c (diff) |
Fix some types in virtual methods to properly override.
Thanks to SAL_OVERRIDE!
Adapting to 1258b576aef2ff3cdd4f44e1c03edb8c862a79f6
Change-Id: Iafc9660312ad33f6136c15170c35a59e61c76b26
Diffstat (limited to 'sot')
-rw-r--r-- | sot/source/sdstor/stg.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgole.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgstrms.hxx | 4 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 6ffb6ba1c822..d6ae01ea7cea 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -223,7 +223,7 @@ sal_uLong StorageStream::Write( const void* pData, sal_uLong nSize ) return nSize; } -sal_uLong StorageStream::Seek( sal_uLong n ) +sal_uInt64 StorageStream::Seek( sal_uInt64 n ) { if( Validate() ) return nPos = pEntry->Seek( n ); diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 9dd24ee5cba0..02f026448510 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -30,7 +30,7 @@ class StgInternalStream : public SvStream BaseStorageStream* pStrm; virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE; virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; - virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE; + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; virtual void FlushData() SAL_OVERRIDE; public: StgInternalStream( BaseStorage&, const OUString&, bool ); diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index e2c2574ceff4..27fdd62c3a93 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -150,14 +150,14 @@ class StgTmpStrm : public SvMemoryStream using SvMemoryStream::GetData; virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE; virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE; - virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE; + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; virtual void FlushData() SAL_OVERRIDE; public: StgTmpStrm( sal_uLong=16 ); ~StgTmpStrm(); bool Copy( StgTmpStrm& ); - void SetSize( sal_uLong ) SAL_OVERRIDE; + virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE; sal_uLong GetSize() const; }; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index a27239c50faf..8c0be298bfb7 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1292,7 +1292,7 @@ sal_uLong UCBStorageStream::Write( const void* pData, sal_uLong nSize ) return pImp->PutData( pData, nSize ); } -sal_uLong UCBStorageStream::Seek( sal_uLong nPos ) +sal_uInt64 UCBStorageStream::Seek( sal_uInt64 nPos ) { //return pImp->m_pStream->Seek( nPos ); return pImp->Seek( nPos ); |