sc/source/filter/excel/xestream.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit b18ae9085ccb101b757bd9926dd58012b327b6f9 Author: Michael Stahl <mst...@redhat.com> Date: Sat Mar 29 15:11:42 2014 +0100 sc: more stream tweaks Change-Id: I452ba76cec425e397369e0fcc689ba639d5325b0 diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index e741e09..e30a39a 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -285,12 +285,13 @@ void XclExpStream::CopyFromStream(SvStream& rInStrm, sal_uInt64 const nBytes) if( nBytesLeft > 0 ) { const sal_Size nMaxBuffer = 4096; - sal_uInt8* pBuffer = new sal_uInt8[ ::std::min( nBytesLeft, nMaxBuffer ) ]; + sal_uInt8 *const pBuffer = + new sal_uInt8[ ::std::min<sal_Size>(nBytesLeft, nMaxBuffer) ]; bool bValid = true; while( bValid && (nBytesLeft > 0) ) { - sal_Size nWriteLen = ::std::min( nBytesLeft, nMaxBuffer ); + sal_Size nWriteLen = ::std::min<sal_Size>(nBytesLeft, nMaxBuffer); rInStrm.Read( pBuffer, nWriteLen ); sal_Size nWriteRet = Write( pBuffer, nWriteLen ); bValid = (nWriteLen == nWriteRet); @@ -369,7 +370,7 @@ void XclExpStream::DisableEncryption() EnableEncryption(false); } -sal_Size XclExpStream::SetSvStreamPos(sal_uInt64 const nPos) +sal_uInt64 XclExpStream::SetSvStreamPos(sal_uInt64 const nPos) { OSL_ENSURE( !mbInRec, "XclExpStream::SetSvStreamPos - not allowed inside of a record" ); return mbInRec ? 0 : mrStrm.Seek( nPos ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits