From 7d8e94444d989d0ac4a4055b207726708e9ec0da Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 11 Jan 2018 08:47:15 +0200 Subject: convert ab?b:a Reviewed-on: https://gerrit.libreoffice.org/47736 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/source/pdfimport/filterdet.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sdext') diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 5ca60e4282e5..99c0f0359fa4 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -443,7 +443,7 @@ bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt64 nBytesRead = 0; while( nCur < nBytes ) { - sal_uInt32 nPass = (nBytes - nCur) > sizeof( aBuf ) ? sizeof( aBuf ) : nBytes - nCur; + sal_uInt32 nPass = std::min(nBytes - nCur, sizeof( aBuf )); if( (aErr = osl_readFile( aRead, aBuf, nPass, &nBytesRead)) != osl_File_E_None || nBytesRead == 0 ) { -- cgit distro/cib/libreoffice-5-0'>distro/cib/libreoffice-5-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Corrius <jesus@softcatala.org>2010-10-28 13:55:00 +0200
committerJesús Corrius <jesus@softcatala.org>2010-10-28 13:55:00 +0200
commit6a6190a7bbe8e12a52a8a0a3b69d58ea4a90c31c (patch)
treecef827598add2bead7fd82a645c681788f3d9faf /xmlsecurity/source/xmlsec/saxhelper.hxx
parent409ed5a0128dd2dfdaf9a8a6984da5cb7f8e22df (diff)
Make some stl functions less ambiguous (fixes VC++ 10 compilation)