[Libreoffice-commits] .: sax/source

Ivan Timofeev ivantimofeev at kemper.freedesktop.org
Mon Mar 12 11:27:01 PDT 2012


 sax/source/expatwrap/xml2utf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53f661b3140fe728fe3b8f421841dcb8e6f716ab
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Mar 12 22:26:05 2012 +0400

    sax: no matching function for call to 'max(int, sal_Int32&)'

diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index b49d3dc..2fb07f5 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -57,7 +57,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In
     if( ! m_bStarted ) {
         // it should be possible to find the encoding attribute
         // within the first 512 bytes == 128 chars in UCS-4
-        nMaxToRead = ::std::max( 512 , nMaxToRead );
+        nMaxToRead = ::std::max( sal_Int32(512) , nMaxToRead );
     }
 
     sal_Int32 nRead;


More information about the Libreoffice-commits mailing list