mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#80556# bug fix

Browse Source
This commit is contained in:
Martin Gallwey
2000-11-28 10:02:31 +00:00
parent 09362c472e
commit 785c6ffe45
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/inc/ZipOutputStream.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipOutputStream.hxx,v $ * $RCSfile: ZipOutputStream.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: mtg $ $Date: 2000-11-24 10:34:26 $ * last change: $Author: mtg $ $Date: 2000-11-28 11:02:31 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -113,7 +113,7 @@ private:
CRC32 aCRC; CRC32 aCRC;
sal_Bool bFinished; sal_Bool bFinished;
ByteChucker aChucker; ByteChucker aChucker;
::std::vector < ::com::sun::star::package::ZipEntry > aZipList; ::std::vector < ::com::sun::star::package::ZipEntry* > aZipList;
public: public:
ZipOutputStream( com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > &xOStream, sal_Int32 nNewBufferSize); ZipOutputStream( com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > &xOStream, sal_Int32 nNewBufferSize);

13
package/source/zippackage/ZipPackage.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackage.cxx,v $ * $RCSfile: ZipPackage.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: mtg $ $Date: 2000-11-28 10:12:00 $ * last change: $Author: mtg $ $Date: 2000-11-28 11:00:26 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -457,17 +457,20 @@ void SAL_CALL ZipPackage::commitChanges( )
ZipPackageBuffer *pBuffer = new ZipPackageBuffer(65535); ZipPackageBuffer *pBuffer = new ZipPackageBuffer(65535);
Reference < XOutputStream > xOutStream = pBuffer; Reference < XOutputStream > xOutStream = pBuffer;
pEntry->nVersion = -1; pEntry->nVersion = -1;
pEntry->nFlag = -1; pEntry->nFlag = 0;
pEntry->nMethod = STORED; pEntry->nMethod = STORED;
pEntry->nTime = -1; pEntry->nTime = -1;
pEntry->nCrc = -1; pEntry->nCrc = 0;
pEntry->nOffset = -1; pEntry->nOffset = -1;
pEntry->sName = OUString::createFromAscii("META-INF/manifest.xml"); pEntry->sName = OUString::createFromAscii("META-INF/manifest.xml");
pZipOut->putNextEntry(*pEntry);
ManifestWriter aWriter ( xOutStream, xFactory, aManList); ManifestWriter aWriter ( xOutStream, xFactory, aManList);
aWriter.Write(); aWriter.Write();
pEntry->nSize = pEntry->nCompressedSize = pBuffer->getPosition(); pEntry->nSize = pEntry->nCompressedSize = pBuffer->getPosition();
pBuffer->aBuffer.realloc(pBuffer->getPosition()); pBuffer->aBuffer.realloc(pBuffer->getPosition());
CRC32 aCRC;
aCRC.update(pBuffer->aBuffer);
pEntry->nCrc = aCRC.getValue();
pZipOut->putNextEntry(*pEntry);
pZipOut->write(pBuffer->aBuffer, 0, pBuffer->getPosition()); pZipOut->write(pBuffer->aBuffer, 0, pBuffer->getPosition());
pZipOut->closeEntry(); pZipOut->closeEntry();
pZipOut->finish(); pZipOut->finish();

7
package/source/zippackage/ZipPackageFolder.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackageFolder.cxx,v $ * $RCSfile: ZipPackageFolder.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: mtg $ $Date: 2000-11-27 16:55:07 $ * last change: $Author: mtg $ $Date: 2000-11-28 11:00:27 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -333,6 +333,9 @@ void ZipPackageFolder::saveContents(rtl::OUString &rPath, std::vector < Manifest
rFoo.writeBytes(bSeq); rFoo.writeBytes(bSeq);
#endif #endif
uno::Reference < io::XInputStream > xStream = pStream->getInputStream(); uno::Reference < io::XInputStream > xStream = pStream->getInputStream();
pStream->aEntry.nCrc = -1;
pStream->aEntry.nSize = -1;
pStream->aEntry.nCompressedSize = -1;
rZipOut.putNextEntry(pStream->aEntry); rZipOut.putNextEntry(pStream->aEntry);
while (1) while (1)
{ {