summaryrefslogtreecommitdiff
path: root/unotools/source/streaming/streamhelper.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-09-14 17:01:50 +0200
committerMichael Stahl <mstahl@redhat.com>2016-09-15 12:01:11 +0200
commitb647996a9babbee7b33cf45192e57df6a124628b (patch)
treeddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /unotools/source/streaming/streamhelper.cxx
parenta19a67e20e847a42063559694ec5beec71abcfb3 (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 'unotools/source/streaming/streamhelper.cxx')
-rw-r--r--unotools/source/streaming/streamhelper.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 9efb0e992419..e2881b7b9a55 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -35,7 +35,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >&
if (aData.getLength() < nBytesToRead)
aData.realloc(nBytesToRead);
- sal_Size nRead(0);
+ std::size_t nRead(0);
ErrCode nError = m_xLockBytes->ReadAt(m_nActPos, static_cast<void*>(aData.getArray()), nBytesToRead, &nRead);
m_nActPos += nRead;
@@ -43,7 +43,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >&
throw css::io::IOException(OUString(), static_cast<css::uno::XWeak*>(this));
// adjust sequence if data read is lower than the desired data
- if (nRead < (sal_Size)aData.getLength())
+ if (nRead < (std::size_t)aData.getLength())
aData.realloc( nRead );
return nRead;