summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:27:47 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-04 11:27:47 +0000
commit49e23b0c2456b784c84f57784b5678e5fda18390 (patch)
treeb227c8129b6a417f6b681e160fe33fb86326fe98
parent75c0ccd925699ac7210eac89b2b9f59af566c797 (diff)
INTEGRATION: CWS ooo20031216 (1.6.14); FILE MERGED
2004/01/09 20:10:15 pjanik 1.6.14.2: #i23922#: Fix previous change. 2004/01/08 17:15:54 pjanik 1.6.14.1: #i23922#: Do not add L modifier after constants.
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 75c3ab3ae254..67f86f54e25e 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XUnbufferedStream.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2003-09-11 10:16:55 $
+ * last change: $Author: hr $ $Date: 2004-02-04 12:27:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -278,7 +278,7 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
if ( nDiff > 0 )
{
mxZipSeek->seek ( mnZipCurrent );
- sal_Int32 nToRead = std::min ( nDiff, std::max ( nRequestedBytes, 8192L ) );
+ sal_Int32 nToRead = std::min ( nDiff, std::max ( nRequestedBytes, static_cast< sal_Int32 >( 8192 ) ) );
sal_Int32 nZipRead = mxZipStream->readBytes ( maCompBuffer, nToRead );
mnZipCurrent += nZipRead;
// maCompBuffer now has the data, check if we need to decrypt