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

#80556# correctly handle new ZipPackageFolders

Browse Source
This commit is contained in:
Martin Gallwey
2000-11-28 11:07:00 +00:00
parent fded13dff3
commit 0135f66c7e
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackage.cxx,v $ * $RCSfile: ZipPackage.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: mtg $ $Date: 2000-11-28 11:09:15 $ * last change: $Author: mtg $ $Date: 2000-11-28 12:07:00 $
* *
* 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
@@ -160,8 +160,17 @@ ZipPackage::ZipPackage (Reference < XInputStream > &xNewInput,
OUString sStreamName = rName.copy( nOldIndex, rName.getLength() - nOldIndex); OUString sStreamName = rName.copy( nOldIndex, rName.getLength() - nOldIndex);
if (isZipFile(aEntry)) if (isZipFile(aEntry))
{ {
// do stuff Reference < XInputStream > xStream = pZipFile->getInputStream(aEntry);
ZipPackage *pInZip = new ZipPackage (xStream, xFactory, pZipBuffer, pZipOut );
aContainedZips.push_back (Reference < XSingleServiceFactory > (pInZip));
pPkgFolder = pInZip->getRootFolder();
pPkgFolder->setName(sStreamName);
pPkgFolder->setParent( Reference < XInterface >(xCurrent, UNO_QUERY));
aAny <<= Reference < XUnoTunnel > (pPkgFolder);
xCurrent->insertByName(sStreamName, aAny);
} }
else
{
pPkgStream = new ZipPackageStream( *pZipFile ); pPkgStream = new ZipPackageStream( *pZipFile );
pPkgStream->bPackageMember = sal_True; pPkgStream->bPackageMember = sal_True;
pPkgStream->setParent( Reference < XInterface > (xCurrent, UNO_QUERY)); pPkgStream->setParent( Reference < XInterface > (xCurrent, UNO_QUERY));
@@ -171,6 +180,7 @@ ZipPackage::ZipPackage (Reference < XInputStream > &xNewInput,
xCurrent->insertByName(sStreamName, aAny); xCurrent->insertByName(sStreamName, aAny);
} }
} }
}
} }
ZipPackage::ZipPackage (const Reference < XMultiServiceFactory > &xNewFactory) ZipPackage::ZipPackage (const Reference < XMultiServiceFactory > &xNewFactory)
@@ -186,6 +196,14 @@ ZipPackage::ZipPackage (const Reference < XMultiServiceFactory > &xNewFactory)
, xZipOut(NULL) , xZipOut(NULL)
, xFactory(xNewFactory) , xFactory(xNewFactory)
{ {
pZipBuffer = new ZipPackageBuffer(65535);
xBuffer = Reference < XOutputStream > (pZipBuffer);
pZipOut = new ZipOutputStream(xBuffer, 65535);
pRootFolder = new ZipPackageFolder(*pZipOut);
xZipOut = Reference < XZipOutputStream > (pZipOut);
xFolder = Reference < XNameContainer > (pRootFolder );
} }
ZipPackage::~ZipPackage( void ) ZipPackage::~ZipPackage( void )
@@ -215,16 +233,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
xStream = xSink->getInputStream(); xStream = xSink->getInputStream();
pZipFile = new ZipFile(xStream); pZipFile = new ZipFile(xStream);
pZipBuffer = new ZipPackageBuffer(65535);
xZipFile = Reference < XZipFile > (pZipFile); xZipFile = Reference < XZipFile > (pZipFile);
xBuffer = Reference < XOutputStream > (pZipBuffer);
pZipOut = new ZipOutputStream(xBuffer, 65535);
pRootFolder = new ZipPackageFolder(*pZipOut);
xZipOut = Reference < XZipOutputStream > (pZipOut);
xFolder = Reference < XNameContainer > (pRootFolder );
Reference< XEnumeration > xEnum = pZipFile->entries(); Reference< XEnumeration > xEnum = pZipFile->entries();
Reference< XNameContainer > xCurrent = xFolder; Reference< XNameContainer > xCurrent = xFolder;
@@ -432,9 +441,9 @@ Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const
Reference < XInterface > xRef; Reference < XInterface > xRef;
aArguments[0] >>= bArg; aArguments[0] >>= bArg;
if (bArg) if (bArg)
xRef = *new ZipPackageStream ( *pZipFile );
else
xRef = *new ZipPackageFolder ( *pZipOut ); xRef = *new ZipPackageFolder ( *pZipOut );
else
xRef = *new ZipPackageStream ( *pZipFile );
return xRef; return xRef;
} }

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

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackageFolder.cxx,v $ * $RCSfile: ZipPackageFolder.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: mtg $ $Date: 2000-11-28 11:00:27 $ * last change: $Author: mtg $ $Date: 2000-11-28 12:07:00 $
* *
* 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
@@ -133,6 +133,8 @@ void SAL_CALL ZipPackageFolder::insertByName( const ::rtl::OUString& aName, cons
{ {
uno::Reference < lang::XUnoTunnel > xRef; uno::Reference < lang::XUnoTunnel > xRef;
aElement >>= xRef; aElement >>= xRef;
uno::Reference < container::XNamed > xNamed (xRef, uno::UNO_QUERY);
xNamed->setName (sName);
aContents[sName] = xRef; aContents[sName] = xRef;
} }
} }
@@ -333,6 +335,8 @@ 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();
uno::Reference < io::XSeekable > xSeek (xStream, uno::UNO_QUERY);
xSeek->seek(0);
pStream->aEntry.nCrc = -1; pStream->aEntry.nCrc = -1;
pStream->aEntry.nSize = -1; pStream->aEntry.nSize = -1;
pStream->aEntry.nCompressedSize = -1; pStream->aEntry.nCompressedSize = -1;