Kaydet (Commit) 3e71c106 authored tarafından Matúš Kukan's avatar Matúš Kukan

Fix some types in virtual methods to properly override.

Thanks to SAL_OVERRIDE!
Adapting to 1258b576

Change-Id: Iafc9660312ad33f6136c15170c35a59e61c76b26
üst 937d3d65
......@@ -78,7 +78,7 @@ public:
TYPEINFO_OVERRIDE();
virtual sal_uLong Read( void * pData, sal_uLong nSize ) = 0;
virtual sal_uLong Write( const void* pData, sal_uLong nSize ) = 0;
virtual sal_uLong Seek( sal_uLong nPos ) = 0;
virtual sal_uInt64 Seek( sal_uInt64 nPos ) = 0;
virtual sal_uLong Tell() = 0;
virtual void Flush() = 0;
virtual bool SetSize( sal_uLong nNewSize ) = 0;
......@@ -160,7 +160,7 @@ public:
StorageStream( StgIo*, StgDirEntry*, StreamMode );
virtual sal_uLong Read( void * pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uLong Write( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uLong Seek( sal_uLong nPos ) SAL_OVERRIDE;
virtual sal_uInt64 Seek( sal_uInt64 nPos ) SAL_OVERRIDE;
virtual sal_uLong Tell() SAL_OVERRIDE { return nPos; }
virtual void Flush() SAL_OVERRIDE;
virtual bool SetSize( sal_uLong nNewSize ) SAL_OVERRIDE;
......@@ -255,7 +255,7 @@ public:
virtual sal_uLong Read( void * pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uLong Write( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uLong Seek( sal_uLong nPos ) SAL_OVERRIDE;
virtual sal_uInt64 Seek( sal_uInt64 nPos ) SAL_OVERRIDE;
virtual sal_uLong Tell() SAL_OVERRIDE;
virtual void Flush() SAL_OVERRIDE;
virtual bool SetSize( sal_uLong nNewSize ) SAL_OVERRIDE;
......
......@@ -39,7 +39,7 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream
com::sun::star::uno::Reference< com::sun::star::io::XSeekable >
m_xSeekable;
SvDataPipe_Impl * m_pPipe;
sal_uLong m_nSeekedFrom;
sal_uInt64 m_nSeekedFrom;
SVL_DLLPRIVATE bool open();
......
......@@ -43,10 +43,10 @@ public:
rTheOutputStream):
m_xOutputStream(rTheOutputStream), m_nPosition(0) {}
virtual ErrCode ReadAt(sal_uInt64, void *, sal_uLong, sal_uInt64 *) const SAL_OVERRIDE;
virtual ErrCode ReadAt(sal_uInt64, void *, sal_uLong, sal_Size *) const SAL_OVERRIDE;
virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, sal_uLong nCount,
sal_uInt64 * pWritten) SAL_OVERRIDE;
sal_Size * pWritten) SAL_OVERRIDE;
virtual ErrCode Flush() const SAL_OVERRIDE;
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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;
};
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment