[Libreoffice-commits] core.git: filter/source

[Matúš Kukan]

 filter/source/graphicfilter/itiff/itiff.cxx |    2 +-
 filter/source/msfilter/escherex.cxx         |    4 ++--
 filter/source/msfilter/msdffimp.cxx         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7a120ad4ac99ac70c35132d12d11d630b92bd846
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Sat Mar 29 12:52:14 2014 +0100

    few more type fixes
    
    Change-Id: I6b953a6792c8c72c29dc0e7b25bdae41da50ca6d

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index fb24548..c15465f 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 c187811..ffe2cb7 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 9063bd0..63686e8 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);
     }