diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-29 12:52:14 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-29 12:52:52 +0100 |
| commit | 7a120ad4ac99ac70c35132d12d11d630b92bd846 (patch) | |
| tree | 6e42961b20d3e1442629c8c88f5aaeaa59a9a4b1 /filter | |
| parent | d761d5e219d745c10997c4accfbfc9eb5717d0e8 (diff) | |
few more type fixes
Change-Id: I6b953a6792c8c72c29dc0e7b25bdae41da50ca6d
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index fb24548da844..c15465f94175 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1156,7 +1156,7 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) pTIFF->ReadUInt16( nTagType ).ReadUInt16( nDataType ).ReadUInt32( nDataLen ).ReadUInt32( nOffset ); if( DataTypeSize() * nDataLen > 4 ) - nMaxPos = std::max( nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos ); + nMaxPos = std::max( (sal_uInt64) nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos ); } pTIFF->ReadUInt32( nOffset ); if ( pTIFF->IsEof() ) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index c18781153b87..ffe2cb729d6f 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -5059,8 +5059,8 @@ class SvNullStream : public SvStream protected: virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE { memset( pData, 0, nSize ); return nSize; } virtual sal_Size PutData( const void*, sal_Size nSize ) SAL_OVERRIDE { return nSize; } - virtual sal_Size SeekPos( sal_Size nPos ) SAL_OVERRIDE { return nPos; } - virtual void SetSize( sal_Size ) SAL_OVERRIDE {} + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE { return nPos; } + virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE {} virtual void FlushData() SAL_OVERRIDE {} public: diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 9063bd0b7023..63686e8d886e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6443,7 +6443,7 @@ sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDat { if( nDatLen ) { - rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen)); + rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_uInt64>(nDatLen)); rpBuff = new char[rBuffLen]; rBuffLen = rStData.Read(rpBuff, rBuffLen); } @@ -6455,7 +6455,7 @@ sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLe { if( nDatLen ) { - rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen)); + rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_uInt64>(nDatLen)); rpBuff = new char[rBuffLen]; rBuffLen = rStData.Read(rpBuff, rBuffLen); } |