diff options
author | Martin Gallwey <mtg@openoffice.org> | 2001-04-30 17:22:56 +0000 |
---|---|---|
committer | Martin Gallwey <mtg@openoffice.org> | 2001-04-30 17:22:56 +0000 |
commit | b0401a23027f504a2712caafe2cec38229c11544 (patch) | |
tree | 1006631864be5ccfb030f8485e1e405d481e35b8 /package | |
parent | 0802bc6db5920670a337330778f5e94918d631a7 (diff) |
Fix raw copying of streams
Diffstat (limited to 'package')
-rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 1ec2cf5f097d..cc37d3be8390 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: mtg $ $Date: 2001-04-27 14:56:07 $ + * last change: $Author: mtg $ $Date: 2001-04-30 18:22:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -388,12 +388,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr // If the entry is already stored in the zip file in the format we // want for this write...copy it raw if (pStream->IsPackageMember() && - ( (pTempEntry->nMethod == DEFLATED && bToBeCompressed) || - (pTempEntry->nMethod == STORED && !bToBeCompressed) ) ) + ( (pStream->aEntry.nMethod == DEFLATED && bToBeCompressed) || + (pStream->aEntry.nMethod == STORED && !bToBeCompressed) ) ) { try { - Reference < XInputStream > xStream = pStream->getRawStream( *pTempEntry ); + Reference < XInputStream > xStream = pStream->getRawStream( pStream->aEntry ); try { rZipOut.putNextEntry ( *pTempEntry, pStream->getEncryptionData(), bToBeEncrypted ); @@ -470,7 +470,6 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr } } - // Then copy it back afterwards... ZipPackageFolder::copyZipEntry ( pStream->aEntry, *pTempEntry ); pStream->aEntry.sName = (*aCI).first; |