diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 087a77461d90..2649c1189d22 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1085,9 +1085,14 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: // Convert vector into a uno::Sequence // TODO/LATER: use Default entries in future - uno::Sequence< beans::StringPair > aDefaultsSequence; - uno::Sequence< beans::StringPair > aOverridesSequence( aManList.size() ); - sal_Int32 nSeqLength = 0; + uno::Sequence< beans::StringPair > aDefaultsSequence(aManList.size()); + // Add at least the application/xml default entry. + aDefaultsSequence[0].First = "xml"; + aDefaultsSequence[0].Second= "application/xml"; + sal_Int32 nDefSeqLength = 1; + + uno::Sequence< beans::StringPair > aOverridesSequence(aManList.size()); + sal_Int32 nOverSeqLength = 0; for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end(); aIter != aEnd; @@ -1101,13 +1106,15 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: if ( !aType.isEmpty() ) { // only nonempty type makes sense here - nSeqLength++; ( *aIter )[PKG_MNFST_FULLPATH].Value >>= aPath; - aOverridesSequence[nSeqLength-1].First = "/" + aPath; - aOverridesSequence[nSeqLength-1].Second = aType; + //FIXME: For now we have no way of deferentiating defaults from others. + aOverridesSequence[nOverSeqLength].First = "/" + aPath; + aOverridesSequence[nOverSeqLength].Second = aType; + ++nOverSeqLength; } } - aOverridesSequence.realloc( nSeqLength ); + aOverridesSequence.realloc(nOverSeqLength); + aDefaultsSequence.realloc(nDefSeqLength); ::comphelper::OFOPXMLHelper::WriteContentSequence( xConTypeOutStream, aDefaultsSequence, aOverridesSequence, m_xContext ); |