diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2010-03-23 14:27:04 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2010-03-23 14:27:04 +0100 |
| commit | fed3bced6461c5464d61cf9d152b623ab1c0c793 (patch) | |
| tree | 7bef7d963a31a331a500e097377e40f706eeee4a /package | |
| parent | 0a9584b0669bd7edb331a2d8a44b21855f0c9c86 (diff) | |
fwk138: #i106389# integrate the patch
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 1ce2c69a2..c0eef60bd 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -539,11 +539,11 @@ 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 ( !bUseNonSeekableAccess && - ( bRawStream || bTransportOwnEncrStreamAsRaw || - ( pStream->IsPackageMember() && !bToBeEncrypted && - ( pStream->aEntry.nMethod == DEFLATED && bToBeCompressed ) || - ( pStream->aEntry.nMethod == STORED && !bToBeCompressed ) ) ) ) + if ( !bUseNonSeekableAccess + && ( bRawStream || bTransportOwnEncrStreamAsRaw + || ( pStream->IsPackageMember() && !bToBeEncrypted + && ( ( pStream->aEntry.nMethod == DEFLATED && bToBeCompressed ) + || ( pStream->aEntry.nMethod == STORED && !bToBeCompressed ) ) ) ) ) { // If it's a PackageMember, then it's an unbuffered stream and we need // to get a new version of it as we can't seek backwards. |