diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /forms | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/imgprod.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index b40d892bdcc8..dab9b8f45574 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -44,8 +44,8 @@ public: explicit ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStreamRef ); virtual ~ImgProdLockBytes() override; - virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, sal_Size nCount, sal_Size * pRead ) const override; - virtual ErrCode WriteAt( sal_uInt64 nPos, const void* pBuffer, sal_Size nCount, sal_Size * pWritten ) override; + virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, std::size_t nCount, std::size_t * pRead ) const override; + virtual ErrCode WriteAt( sal_uInt64 nPos, const void* pBuffer, std::size_t nCount, std::size_t * pWritten ) override; virtual ErrCode Flush() const override; virtual ErrCode SetSize( sal_uInt64 nSize ) override; virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const override; @@ -90,7 +90,7 @@ ImgProdLockBytes::~ImgProdLockBytes() ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos, - void* pBuffer, sal_Size nCount, sal_Size * pRead) const + void* pBuffer, std::size_t nCount, std::size_t * pRead) const { if( GetStream() ) { @@ -101,7 +101,7 @@ ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos, } else { - const sal_Size nSeqLen = maSeq.getLength(); + const std::size_t nSeqLen = maSeq.getLength(); ErrCode nErr = ERRCODE_NONE; if( nPos < nSeqLen ) @@ -121,7 +121,7 @@ ErrCode ImgProdLockBytes::ReadAt(sal_uInt64 const nPos, ErrCode ImgProdLockBytes::WriteAt(sal_uInt64 const nPos, - const void* pBuffer, sal_Size nCount, sal_Size * pWritten) + const void* pBuffer, std::size_t nCount, std::size_t * pWritten) { if( GetStream() ) return SvLockBytes::WriteAt( nPos, pBuffer, nCount, pWritten ); |