diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-11 09:43:02 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-11 09:43:02 +0000 |
commit | d2c6f54ffadd15ef3d9b796695c5e757794a63c4 (patch) | |
tree | c34e893293817ef77ffb2545414257192fc81280 /package/source | |
parent | 91f254acc18c18be1e148f5bdb1cfd8764cc6189 (diff) |
INTEGRATION: CWS fwkpp3showstop4 (1.12.30); FILE MERGED
2006/05/09 16:39:50 mav 1.12.30.1: #i65066# use internal offset
Diffstat (limited to 'package/source')
-rw-r--r-- | package/source/zipapi/Deflater.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index c653b0d250f2..ca656dfcef07 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Deflater.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:11:32 $ + * last change: $Author: hr $ $Date: 2006-05-11 10:43:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,7 +123,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int sal_Int32 nResult; if (bSetParams) { - pStream->next_in = (unsigned char*) sInBuffer.getConstArray(); + pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset; pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset; pStream->avail_in = nLength; pStream->avail_out = nNewLength; @@ -151,7 +151,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int } else { - pStream->next_in = (unsigned char*) sInBuffer.getConstArray(); + pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset; pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset; pStream->avail_in = nLength; pStream->avail_out = nNewLength; |