strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS unopkg1 (1.89.10); FILE MERGED

Browse source 
2004/03/10 10:15:54 mav 1.89.10.1: #i26283# do not hide META-INF folder
This commit is contained in:
Jens-Heiner Rechtien 2004-04-13 11:22:22 +00:00
parent 672d5cedb3
commit e6810dba1c
1 changed files with 121 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

214
package/source/zippackage/ZipPackage.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackage.cxx,v $ * $RCSfile: ZipPackage.cxx,v $
* *
* $Revision: 1.89 $ * $Revision: 1.90 $
* *
* last change: $Author: hr $ $Date: 2004-02-04 12:28:25 $ * last change: $Author: hr $ $Date: 2004-04-13 12:22:22 $
* *
* 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
@ -365,107 +365,119 @@ void ZipPackage::getZipFileContents()
pPkgStream->doSetParent( pCurrent, sal_True ); pPkgStream->doSetParent( pCurrent, sal_True );
} }
} }
const OUString sManifest (RTL_CONSTASCII_USTRINGPARAM( "META-INF/manifest.xml") );
if (hasByHierarchicalName( sManifest ) ) const OUString sMeta ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF" ) );
if ( xRootFolder->hasByName( sMeta ) )
{ {
const OUString sManifest (RTL_CONSTASCII_USTRINGPARAM( "manifest.xml") );
try { try {
Reference < XUnoTunnel > xTunnel; Reference< XUnoTunnel > xTunnel;
Any aAny = getByHierarchicalName( sManifest ); Any aAny = xRootFolder->getByName( sMeta );
aAny >>= xTunnel; aAny >>= xTunnel;
Reference < XActiveDataSink > xSink (xTunnel, UNO_QUERY); Reference< XNameContainer > xMetaInfFolder( xTunnel, UNO_QUERY );
if (xSink.is()) if ( xMetaInfFolder.is() && xMetaInfFolder->hasByName( sManifest ) )
{ {
OUString sManifestReader ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestReader" ) ); aAny = xMetaInfFolder->getByName( sManifest );
Reference < XManifestReader > xReader (xFactory->createInstance( sManifestReader ), UNO_QUERY ); aAny >>= xTunnel;
if ( xReader.is() ) Reference < XActiveDataSink > xSink (xTunnel, UNO_QUERY);
if (xSink.is())
{ {
const OUString sPropFullPath ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) ); OUString sManifestReader ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestReader" ) );
const OUString sPropMediaType ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) ); Reference < XManifestReader > xReader (xFactory->createInstance( sManifestReader ), UNO_QUERY );
const OUString sPropInitialisationVector ( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) ); if ( xReader.is() )
const OUString sPropSalt ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) );
const OUString sPropIterationCount ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
const OUString sPropSize ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
const OUString sPropDigest ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
Sequence < Sequence < PropertyValue > > aManifestSequence = xReader->readManifestSequence ( xSink->getInputStream() );
sal_Int32 nLength = aManifestSequence.getLength();
const Sequence < PropertyValue > *pSequence = aManifestSequence.getConstArray();
ZipPackageStream *pStream = NULL;
ZipPackageFolder *pFolder = NULL;
for (sal_Int32 i = 0; i < nLength ; i++, pSequence++)
{ {
OUString sPath, sMediaType; const OUString sPropFullPath ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
const PropertyValue *pValue = pSequence->getConstArray(); const OUString sPropMediaType ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
const Any *pSalt = NULL, *pVector = NULL, *pCount = NULL, *pSize = NULL, *pDigest = NULL; const OUString sPropInitialisationVector ( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) );
for (sal_Int32 j = 0, nNum = pSequence->getLength(); j < nNum; j++ ) const OUString sPropSalt ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) );
const OUString sPropIterationCount ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
const OUString sPropSize ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
const OUString sPropDigest ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
Sequence < Sequence < PropertyValue > > aManifestSequence = xReader->readManifestSequence ( xSink->getInputStream() );
sal_Int32 nLength = aManifestSequence.getLength();
const Sequence < PropertyValue > *pSequence = aManifestSequence.getConstArray();
ZipPackageStream *pStream = NULL;
ZipPackageFolder *pFolder = NULL;
for (sal_Int32 i = 0; i < nLength ; i++, pSequence++)
{ {
if (pValue[j].Name.equals( sPropFullPath ) ) OUString sPath, sMediaType;
pValue[j].Value >>= sPath; const PropertyValue *pValue = pSequence->getConstArray();
else if (pValue[j].Name.equals( sPropMediaType ) ) const Any *pSalt = NULL, *pVector = NULL, *pCount = NULL, *pSize = NULL, *pDigest = NULL;
pValue[j].Value >>= sMediaType; for (sal_Int32 j = 0, nNum = pSequence->getLength(); j < nNum; j++ )
else if (pValue[j].Name.equals( sPropSalt ) )
pSalt = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropInitialisationVector ) )
pVector = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropIterationCount ) )
pCount = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropSize ) )
pSize = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropDigest ) )
pDigest = &(pValue[j].Value);
}
if (sPath.getLength() && hasByHierarchicalName ( sPath ) )
{
Any aAny = getByHierarchicalName( sPath );
Reference < XUnoTunnel > xTunnel;
aAny >>= xTunnel;
sal_Int64 nTest=0;
if ((nTest = xTunnel->getSomething(ZipPackageFolder::static_getImplementationId())) != 0)
{ {
pFolder = reinterpret_cast < ZipPackageFolder* > ( nTest ); if (pValue[j].Name.equals( sPropFullPath ) )
pFolder->SetMediaType ( sMediaType ); pValue[j].Value >>= sPath;
else if (pValue[j].Name.equals( sPropMediaType ) )
pValue[j].Value >>= sMediaType;
else if (pValue[j].Name.equals( sPropSalt ) )
pSalt = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropInitialisationVector ) )
pVector = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropIterationCount ) )
pCount = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropSize ) )
pSize = &(pValue[j].Value);
else if (pValue[j].Name.equals( sPropDigest ) )
pDigest = &(pValue[j].Value);
} }
else if (sPath.getLength() && hasByHierarchicalName ( sPath ) )
{ {
pStream = reinterpret_cast < ZipPackageStream* > ( xTunnel->getSomething(ZipPackageStream::static_getImplementationId())); Any aAny = getByHierarchicalName( sPath );
pStream->SetMediaType ( sMediaType ); Reference < XUnoTunnel > xTunnel;
aAny >>= xTunnel;
if (pSalt && pVector && pCount && pSize) sal_Int64 nTest=0;
if ((nTest = xTunnel->getSomething(ZipPackageFolder::static_getImplementationId())) != 0)
{ {
Sequence < sal_uInt8 > aSequence; pFolder = reinterpret_cast < ZipPackageFolder* > ( nTest );
sal_Int32 nCount, nSize; pFolder->SetMediaType ( sMediaType );
pStream->SetToBeEncrypted ( sal_True ); }
else
{
pStream = reinterpret_cast < ZipPackageStream* > ( xTunnel->getSomething(ZipPackageStream::static_getImplementationId()));
pStream->SetMediaType ( sMediaType );
*pSalt >>= aSequence; if (pSalt && pVector && pCount && pSize)
pStream->setSalt ( aSequence );
*pVector >>= aSequence;
pStream->setInitialisationVector ( aSequence );
*pCount >>= nCount;
pStream->setIterationCount ( nCount );
*pSize >>= nSize;
pStream->setSize ( nSize );
if ( pDigest )
{ {
*pDigest >>= aSequence; Sequence < sal_uInt8 > aSequence;
pStream->setDigest ( aSequence ); sal_Int32 nCount, nSize;
} pStream->SetToBeEncrypted ( sal_True );
pStream->SetToBeEncrypted ( sal_True ); *pSalt >>= aSequence;
pStream->SetIsEncrypted ( sal_True ); pStream->setSalt ( aSequence );
if ( !bHasEncryptedEntries && pStream->getName().compareToAscii ( "content.xml" ) == 0 )
bHasEncryptedEntries = sal_True; *pVector >>= aSequence;
pStream->setInitialisationVector ( aSequence );
*pCount >>= nCount;
pStream->setIterationCount ( nCount );
*pSize >>= nSize;
pStream->setSize ( nSize );
if ( pDigest )
{
*pDigest >>= aSequence;
pStream->setDigest ( aSequence );
}
pStream->SetToBeEncrypted ( sal_True );
pStream->SetIsEncrypted ( sal_True );
if ( !bHasEncryptedEntries && pStream->getName().compareToAscii ( "content.xml" ) == 0 )
bHasEncryptedEntries = sal_True;
}
} }
} }
} }
} }
else
VOS_ENSURE ( 0, "Couldn't get a ManifestReader!" ); // throw RuntimeException?
} }
else
VOS_ENSURE ( 0, "Couldn't get a ManifestReader!" ); // throw RuntimeException? // now hide the manifest.xml file from user
xMetaInfFolder->removeByName( sManifest );
} }
} }
catch( Exception& ) catch( Exception& )
@ -475,10 +487,6 @@ void ZipPackage::getZipFileContents()
} }
} }
const OUString sMeta ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF" ) );
if ( xRootFolder->hasByName( sMeta ) )
xRootFolder->removeByName( sMeta );
const OUString sMimetype ( RTL_CONSTASCII_USTRINGPARAM ( "mimetype" ) ); const OUString sMimetype ( RTL_CONSTASCII_USTRINGPARAM ( "mimetype" ) );
if ( xRootFolder->hasByName( sMimetype ) ) if ( xRootFolder->hasByName( sMimetype ) )
xRootFolder->removeByName( sMimetype ); xRootFolder->removeByName( sMimetype );
@ -879,12 +887,32 @@ sal_Bool ZipPackage::writeFileIsTemp()
aZipOut.setMethod(DEFLATED); aZipOut.setMethod(DEFLATED);
aZipOut.setLevel(DEFAULT_COMPRESSION); aZipOut.setLevel(DEFAULT_COMPRESSION);
// Remove the old META-INF directory (if there is one) as the // Remove the old manifest.xml file as the
// manifest will be re-generated and the META-INF directory implicitly // manifest will be re-generated and the
// created // META-INF directory implicitly created if does not exist
const OUString sMeta ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF" ) ); const OUString sMeta ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF" ) );
if (xRootFolder->hasByName( sMeta ) ) try {
xRootFolder->removeByName( sMeta ); if ( xRootFolder->hasByName( sMeta ) )
{
const OUString sManifest (RTL_CONSTASCII_USTRINGPARAM( "manifest.xml") );
Reference< XUnoTunnel > xTunnel;
Any aAny = xRootFolder->getByName( sMeta );
aAny >>= xTunnel;
Reference< XNameContainer > xMetaInfFolder( xTunnel, UNO_QUERY );
if ( xMetaInfFolder.is() && xMetaInfFolder->hasByName( sManifest ) )
xMetaInfFolder->removeByName( sManifest );
}
}
catch (::com::sun::star::uno::RuntimeException & r )
{
VOS_ENSURE( 0, "Error preparing ZIP file for writing to disk" );
throw WrappedTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM ( "Error preparing ZIP file for writing to disk!" ) ),
static_cast < OWeakObject * > ( this ),
makeAny( r ) );
}
// Write a magic file with mimetype // Write a magic file with mimetype
WriteMimetypeMagicFile( aZipOut ); WriteMimetypeMagicFile( aZipOut );