summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Gallwey <mtg@openoffice.org>2001-08-30 12:45:19 +0000
committerMartin Gallwey <mtg@openoffice.org>2001-08-30 12:45:19 +0000
commit38192c9c2715e8ae03cddd559ca1509ae081545c (patch)
treef778b12ef072873a38f8534fa36e25eb22015ab9
parent9de61f25b1b16f780d426d1b2e98232b04bfa189 (diff)
#91474# do not explicitly export Directories
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx31
1 files changed, 5 insertions, 26 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 30091e017a96..233b777279a3 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageFolder.cxx,v $
*
- * $Revision: 1.46 $
+ * $Revision: 1.47 $
*
- * last change: $Author: mtg $ $Date: 2001-08-08 18:32:39 $
+ * last change: $Author: mtg $ $Date: 2001-08-30 13:45:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -327,35 +327,14 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
if (bIsFolder)
{
- // In case the entry we are reading is also the entry we are writing, we will
- // store the ZipEntry data in pTempEntry
- ZipPackageFolder::copyZipEntry ( *pTempEntry, pFolder->aEntry );
- pTempEntry->nTime = ZipOutputStream::getCurrentDosTime();
- pTempEntry->nCrc = pTempEntry->nSize = pTempEntry->nCompressedSize = 0;
- pTempEntry->nMethod = STORED;
- pTempEntry->sName = rPath + rShortName + OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
- try
- {
- vos::ORef < EncryptionData > xEmpty;
- rZipOut.putNextEntry( *pTempEntry, xEmpty );
- rZipOut.closeEntry();
- }
- catch (IOException & )
- {
- VOS_ENSURE( 0, "Error writing ZipOutputStream" );
- }
+ OUString sTempName = rPath + rShortName + OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
pValue[0].Name = sMediaTypeProperty;
pValue[0].Value <<= pFolder->GetMediaType();
pValue[1].Name = sFullPathProperty;
- pValue[1].Value <<= pTempEntry->sName;
+ pValue[1].Value <<= sTempName;
- // Copy back the zip entry and make the offset negative so that we
- // know it's point at the beginning of the LOC
- ZipPackageFolder::copyZipEntry ( pFolder->aEntry, *pTempEntry );
- pFolder->aEntry.nOffset *= -1;
- pFolder->saveContents(pTempEntry->sName, rManList, rZipOut, rEncryptionKey, rRandomPool);
- pFolder->aEntry.sName = rShortName;
+ pFolder->saveContents( sTempName, rManList, rZipOut, rEncryptionKey, rRandomPool);
}
else
{