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

INTEGRATION: CWS opofxmlstorage (1.80.20); FILE MERGED

Browse source 
2006/04/21 11:37:00 mav 1.80.20.1: #i64612# support OFOPXML format
This commit is contained in:
Oliver Bolte 2006-10-13 10:52:06 +00:00
parent 2128c967fa
commit 6925465ef7
1 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
package/source/zippackage/ZipPackageFolder.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: ZipPackageFolder.cxx,v $ * $RCSfile: ZipPackageFolder.cxx,v $
* *
* $Revision: 1.81 $ * $Revision: 1.82 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 17:29:24 $ * last change: $Author: obo $ $Date: 2006-10-13 11:52:06 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -93,15 +93,16 @@ using namespace com::sun::star::io;
using namespace cppu; using namespace cppu;
using namespace rtl; using namespace rtl;
using namespace std; using namespace std;
using namespace ::com::sun::star;
using vos::ORef; using vos::ORef;
Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > (); Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory, ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
sal_Bool bPackageFormat, sal_Int16 nFormat,
sal_Bool bAllowRemoveOnInsert ) sal_Bool bAllowRemoveOnInsert )
: m_xFactory( xFactory ) : m_xFactory( xFactory )
, m_bPackageFormat( bPackageFormat ) , m_nFormat( nFormat )
{ {
OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package folder!" ); OSL_ENSURE( m_xFactory.is(), "No factory is provided to the package folder!" );
@ -127,6 +128,33 @@ ZipPackageFolder::~ZipPackageFolder()
{ {
} }
void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& aPair )
{
::rtl::OUString aExt;
if ( aPair.First.toChar() == (sal_Unicode)'.' )
aExt = aPair.First;
else
aExt = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) + aPair.First;
for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end();
aCI != aEnd;
aCI++)
{
const OUString &rShortName = (*aCI).first;
const ContentInfo &rInfo = *(*aCI).second;
if ( rInfo.bFolder )
rInfo.pFolder->setChildStreamsTypeByExtension( aPair );
else
{
sal_Int32 nNameLength = rShortName.getLength();
sal_Int32 nExtLength = aExt.getLength();
if ( nNameLength >= nExtLength && rShortName.match( aExt, nNameLength - nExtLength ) )
rInfo.pStream->SetMediaType( aPair.Second );
}
}
}
void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource) void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource)
{ {
rDest.nVersion = rSource.nVersion; rDest.nVersion = rSource.nVersion;
@ -272,7 +300,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() ? sal_True : sal_False; sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() ? sal_True : sal_False;
if ( maContents.begin() == maContents.end() && rPath.getLength() ) if ( maContents.begin() == maContents.end() && rPath.getLength() && m_nFormat != OFOPXML_FORMAT )
{ {
// it is an empty subfolder, use workaround to store it // it is an empty subfolder, use workaround to store it
ZipEntry* pTempEntry = new ZipEntry(); ZipEntry* pTempEntry = new ZipEntry();
@ -646,7 +674,10 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
pStream->aEntry.nOffset *= -1; pStream->aEntry.nOffset *= -1;
} }
} }
rManList.push_back (aPropSet);
// folder can have a mediatype only in package format
if ( m_nFormat == PACKAGE_FORMAT || ( m_nFormat == OFOPXML_FORMAT && !rInfo.bFolder ) )
rManList.push_back( aPropSet );
} }
if( bWritingFailed ) if( bWritingFailed )
@ -696,8 +727,8 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName,
{ {
if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType"))) if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MediaType")))
{ {
if ( !m_bPackageFormat ) if ( m_nFormat != PACKAGE_FORMAT )
throw PropertyVetoException(); throw UnknownPropertyException();
aValue >>= sMediaType; aValue >>= sMediaType;
} }
@ -710,7 +741,12 @@ Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{ {
if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
{
if ( m_nFormat != PACKAGE_FORMAT )
throw UnknownPropertyException();
return makeAny ( sMediaType ); return makeAny ( sMediaType );
}
else if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Size" ) ) ) else if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Size" ) ) )
return makeAny ( aEntry.nSize ); return makeAny ( aEntry.nSize );
else else