summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:28:06 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:28:06 +0000
commit76855e49cfb4861538001d9b28e9ced1cd489746 (patch)
treeba0505dc29b7db724bc02fc42f24f6fe9f0ef464 /package
parent49e23b0c2456b784c84f57784b5678e5fda18390 (diff)
INTEGRATION: CWS ooo20031216 (1.40.14); FILE MERGED
2004/01/09 20:10:44 pjanik 1.40.14.3: #i23922#: Fix previous change. 2004/01/08 17:15:55 pjanik 1.40.14.2: #i23922#: Do not add L modifier after constants. 2003/12/25 12:38:39 waratah 1.40.14.1: #i1858# remove test of unsigned less than 0, always false
Diffstat (limited to 'package')
-rw-r--r--package/source/zipapi/ZipFile.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 299db7e4f6c8..5a6b144b4ef2 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipFile.cxx,v $
*
- * $Revision: 1.40 $
+ * $Revision: 1.41 $
*
- * last change: $Author: kz $ $Date: 2003-09-11 10:17:20 $
+ * last change: $Author: hr $ $Date: 2004-02-04 12:28:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -750,7 +750,7 @@ sal_Int32 ZipFile::readCEN()
aGrabber >> nCenLen;
aGrabber >> nCenOff;
- if ( nTotal < 0 || nTotal * CENHDR > nCenLen )
+ if ( nTotal * CENHDR > nCenLen )
throw ZipException(OUString( RTL_CONSTASCII_USTRINGPARAM ( "invalid END header (bad entry count)") ), Reference < XInterface > () );
if ( nTotal > ZIP_MAXENTRIES )
@@ -1012,7 +1012,7 @@ sal_Int32 ZipFile::getCRC( sal_Int32 nOffset, sal_Int32 nSize )
{
Sequence < sal_Int8 > aBuffer;
CRC32 aCRC;
- sal_Int32 nBlockSize = ::std::min( nSize, 32000L );
+ sal_Int32 nBlockSize = ::std::min( nSize, static_cast< sal_Int32 >( 32000 ) );
aGrabber.seek( nOffset );
for ( int ind = 0;
@@ -1031,7 +1031,7 @@ void ZipFile::getSizeAndCRC( sal_Int32 nOffset, sal_Int32 nCompressedSize, sal_I
CRC32 aCRC;
sal_Int32 nRealSize = 0;
Inflater aInflater( sal_True );
- sal_Int32 nBlockSize = ::std::min( nCompressedSize, 32000L );
+ sal_Int32 nBlockSize = ::std::min( nCompressedSize, static_cast< sal_Int32 >( 32000 ) );
aGrabber.seek( nOffset );
for ( int ind = 0;