diff options
Diffstat (limited to 'svl/source')
| -rw-r--r-- | svl/source/items/lckbitem.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/inettype.cxx | 14 | ||||
| -rw-r--r-- | svl/source/misc/strmadpt.cxx | 24 |
3 files changed, 20 insertions, 20 deletions
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 9126580162e5..bda67f85936a 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -141,7 +141,7 @@ bool SfxLockBytesItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const else return false; - sal_uLong nRead = 0; + std::size_t nRead = 0; css::uno::Sequence< sal_Int8 > aSeq( nLen ); _xVal->ReadAt( 0, aSeq.getArray(), nLen, &nRead ); diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 0f2749a9051a..f62b31f06b55 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -118,7 +118,7 @@ inline TypeIDMapEntry * Registration::getEntry(INetContentType eTypeID) } MediaTypeEntry const * seekEntry(OUString const & rTypeName, - MediaTypeEntry const * pMap, sal_Size nSize); + MediaTypeEntry const * pMap, std::size_t nSize); /** A mapping from type names to type ids and extensions. Sorted by type name. @@ -499,21 +499,21 @@ namespace { MediaTypeEntry const * seekEntry(OUString const & rTypeName, - MediaTypeEntry const * pMap, sal_Size nSize) + MediaTypeEntry const * pMap, std::size_t nSize) { #if defined DBG_UTIL - for (sal_Size i = 0; i < nSize - 1; ++i) + for (std::size_t i = 0; i < nSize - 1; ++i) DBG_ASSERT( rtl_str_compare( pMap[i].m_pTypeName, pMap[i + 1].m_pTypeName) < 0, "seekEntry(): Bad map"); #endif - sal_Size nLow = 0; - sal_Size nHigh = nSize; + std::size_t nLow = 0; + std::size_t nHigh = nSize; while (nLow != nHigh) { - sal_Size nMiddle = (nLow + nHigh) / 2; + std::size_t nMiddle = (nLow + nHigh) / 2; MediaTypeEntry const * pEntry = pMap + nMiddle; sal_Int32 nCmp = rTypeName.compareToIgnoreAsciiCaseAscii(pEntry->m_pTypeName); if (nCmp < 0) @@ -582,7 +582,7 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID) static bool bInitialized = false; if (!bInitialized) { - for (sal_Size i = 0; i <= CONTENT_TYPE_LAST; ++i) + for (std::size_t i = 0; i <= CONTENT_TYPE_LAST; ++i) aMap[aStaticTypeNameMap[i].m_eTypeID] = aStaticTypeNameMap[i].m_pTypeName; aMap[CONTENT_TYPE_UNKNOWN] = CONTENT_TYPE_STR_APP_OCTSTREAM; aMap[CONTENT_TYPE_TEXT_PLAIN] = CONTENT_TYPE_STR_TEXT_PLAIN diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index f29b7663ca36..3e1c17954080 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -139,7 +139,7 @@ bool SvInputStream::open() } // virtual -sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) +std::size_t SvInputStream::GetData(void * pData, std::size_t const nSize) { if (!open()) { @@ -168,8 +168,8 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) { sal_Int32 nRemain = sal_Int32( - std::min(sal_uLong(nSize - nRead), - sal_uLong(std::numeric_limits< sal_Int32 >::max()))); + std::min(std::size_t(nSize - nRead), + std::size_t(std::numeric_limits<sal_Int32>::max()))); if (nRemain == 0) break; uno::Sequence< sal_Int8 > aBuffer; @@ -205,8 +205,8 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) sal_Int32 nRemain = sal_Int32( std::min( - sal_uLong(nSize - nRead), - sal_uLong(std::numeric_limits< sal_Int32 >::max()))); + std::size_t(nSize - nRead), + std::size_t(std::numeric_limits<sal_Int32>::max()))); if (nRemain == 0) break; uno::Sequence< sal_Int8 > aBuffer; @@ -235,7 +235,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) } // virtual -sal_uLong SvInputStream::PutData(void const *, sal_uLong) +std::size_t SvInputStream::PutData(void const *, std::size_t) { SetError(ERRCODE_IO_NOTSUPPORTED); return 0; @@ -265,7 +265,7 @@ sal_uInt64 SvInputStream::SeekPos(sal_uInt64 const nPos) < STREAM_SEEK_TO_END) { m_nSeekedFrom = Tell(); - return sal_uLong(nLength); + return sal_uInt64(nLength); } } catch (const io::IOException&) @@ -347,27 +347,27 @@ SvInputStream::~SvInputStream() // SvOutputStream // virtual -sal_uLong SvOutputStream::GetData(void *, sal_uLong) +std::size_t SvOutputStream::GetData(void *, std::size_t) { SetError(ERRCODE_IO_NOTSUPPORTED); return 0; } // virtual -sal_uLong SvOutputStream::PutData(void const * pData, sal_uLong nSize) +std::size_t SvOutputStream::PutData(void const * pData, std::size_t nSize) { if (!m_xStream.is()) { SetError(ERRCODE_IO_CANTWRITE); return 0; } - sal_uLong nWritten = 0; + std::size_t nWritten = 0; for (;;) { sal_Int32 nRemain = sal_Int32( - std::min(sal_uLong(nSize - nWritten), - sal_uLong(std::numeric_limits< sal_Int32 >::max()))); + std::min(std::size_t(nSize - nWritten), + std::size_t(std::numeric_limits<sal_Int32>::max()))); if (nRemain == 0) break; try |