summaryrefslogtreecommitdiff
path: root/package/source/zipapi/EntryInputStream.cxx
diff options
context:
space:
mode:
authorMartin Gallwey <mtg@openoffice.org>2000-12-04 10:30:09 +0000
committerMartin Gallwey <mtg@openoffice.org>2000-12-04 10:30:09 +0000
commit2056f50eadd8c850f32e5b7c7fa6fc770db16264 (patch)
treeb95b8a2228f84a22c2d69c8650d86494678357e6 /package/source/zipapi/EntryInputStream.cxx
parent8c42ca8d118b0be4ece362f5f06f0c2629e81c75 (diff)
#80556# improved exception handling
Diffstat (limited to 'package/source/zipapi/EntryInputStream.cxx')
-rw-r--r--package/source/zipapi/EntryInputStream.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/package/source/zipapi/EntryInputStream.cxx b/package/source/zipapi/EntryInputStream.cxx
index 9b2db8274454..ed198aac5882 100644
--- a/package/source/zipapi/EntryInputStream.cxx
+++ b/package/source/zipapi/EntryInputStream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: EntryInputStream.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mtg $ $Date: 2000-12-01 10:49:47 $
+ * last change: $Author: mtg $ $Date: 2000-12-04 11:30:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,7 +76,7 @@ using namespace com::sun::star;
* seek to it before performing any reads.
*/
-EntryInputStream::EntryInputStream( uno::Reference < io::XInputStream > xNewInput, sal_Int64 nNewBegin, sal_Int64 nNewEnd, sal_Int32 nNewBufferSize, sal_Int64 nUncompressedSize)
+EntryInputStream::EntryInputStream( uno::Reference < io::XInputStream > xNewInput, sal_Int64 nNewBegin, sal_Int64 nNewEnd, sal_Int32 nNewBufferSize, sal_Int64 nUncompressedSize, sal_Bool bIsDeflated)
: xStream( xNewInput )
, xSeek( xNewInput, uno::UNO_QUERY )
, nCompBegin( nNewBegin )
@@ -89,11 +89,8 @@ EntryInputStream::EntryInputStream( uno::Reference < io::XInputStream > xNewInpu
, bReachEOF ( sal_False )
, aInflater( sal_True )
, aBuffer( static_cast < sal_Int32 > (nUncompressedSize) )
+, bDeflated ( bIsDeflated )
{
- if (nCompEnd - nCompBegin < nUncompressedSize)
- bDeflated = sal_True;
- else
- bDeflated = sal_False;
if (bDeflated)
{
xSeek->seek(nNewBegin);