diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-28 23:03:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-29 02:03:07 +0100 |
| commit | 19bbfc0b39d79a90539fd3094d9b6d7d81619a45 (patch) | |
| tree | ccac02c9c175f7254c08a108c5107d7f3ebed87f /include/tools | |
| parent | 655a39d8c0d151618d7c3b3fe0dcff508c2b53c5 (diff) | |
tools: allow 64-bit positions on SvLockBytes
Bump stream positions to 64 bits on:
SvLockBytes::ReadAt()
SvLockBytes::WriteAt()
SvAsyncLockBytes::m_nSize
SvOpenLockBytes::Seek()
SvOpenLockBytes::Tell()
SvOutputStreamOpenLockBytes::m_nPosition
OInputStreamHelper::m_nActPos
Change-Id: Ica3b674e0ab23a756260a51475e97a5396ecdddb
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/stream.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 929432a88650..448b4811865d 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -129,9 +129,9 @@ public: virtual void SetSynchronMode(bool bTheSync = true) { m_bSync = bTheSync; } virtual bool IsSynchronMode() const { return m_bSync; } - virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount, + virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount, sal_Size * pRead) const; - virtual ErrCode WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCount, + virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, sal_Size nCount, sal_Size * pWritten); virtual ErrCode Flush() const; @@ -157,9 +157,9 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) = 0; - virtual sal_Size Tell() const = 0; + virtual sal_uInt64 Tell() const = 0; - virtual sal_Size Seek(sal_Size nPos) = 0; + virtual sal_uInt64 Seek(sal_uInt64 nPos) = 0; virtual void Terminate() = 0; }; @@ -170,7 +170,7 @@ SV_DECL_IMPL_REF(SvOpenLockBytes); class SvAsyncLockBytes: public SvOpenLockBytes { - sal_Size m_nSize; + sal_uInt64 m_nSize; bool m_bTerminated; public: @@ -179,17 +179,17 @@ public: SvAsyncLockBytes(SvStream * pStream, bool bOwner): SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {} - virtual ErrCode ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount, + virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount, sal_Size * pRead) const SAL_OVERRIDE; - virtual ErrCode WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCount, + virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, sal_Size nCount, sal_Size * pWritten) SAL_OVERRIDE; virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) SAL_OVERRIDE; - virtual sal_Size Tell() const SAL_OVERRIDE { return m_nSize; } + virtual sal_uInt64 Tell() const SAL_OVERRIDE { return m_nSize; } - virtual sal_Size Seek(sal_Size nPos) SAL_OVERRIDE; + virtual sal_uInt64 Seek(sal_uInt64 nPos) SAL_OVERRIDE; virtual void Terminate() SAL_OVERRIDE { m_bTerminated = true; } }; |