diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-20 21:13:50 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-17 10:49:20 +0100 |
| commit | 2d92a84a6aac37e34d1699fdebe0270468b4f746 (patch) | |
| tree | 0ea2d2eb83775800e6bbf0106ef26cd09f39137e /package/source/zippackage/ZipPackageFolder.cxx | |
| parent | 15678e7483369fae400c3b289c85e63001b3d131 (diff) | |
package: Move most ZipOutputEntry's methods back to ZipOutputStream
We want to use ZipOutputEntry only for deflating (and maybe rename it).
ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the
data still needs to be written sequentially anyway. Otherwise it's hard
to get offset positions of individual entries right.
Since this commit rawCloseEntry needs to be called always; also when we
use write&closeEntry because we don't call writeEXT in closeEntry
anymore.
Need to rename and add comments later.
Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
Diffstat (limited to 'package/source/zippackage/ZipPackageFolder.cxx')
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index c2e5a4fa2f9a..a6b2e5c139a7 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -21,7 +21,6 @@ #include <ZipPackageFolder.hxx> #include <ZipFile.hxx> -#include <ZipOutputEntry.hxx> #include <ZipOutputStream.hxx> #include <ZipPackageStream.hxx> #include <PackageConstants.hxx> @@ -338,9 +337,8 @@ void ZipPackageFolder::saveContents( try { - ZipOutputEntry aZipEntry(m_xContext, rZipOut.getChucker(), *pTempEntry, NULL, false); - aZipEntry.rawCloseEntry(); - rZipOut.addEntry(pTempEntry); + rZipOut.putNextEntry( *pTempEntry ); + rZipOut.rawCloseEntry(); } catch ( ZipException& ) { |