diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-03-25 10:29:38 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-04-03 19:53:42 +0200 |
| commit | caef781b0aa6433ef210f9a5cf6e52e33d7e534a (patch) | |
| tree | 0bcec7104e82218e6ae0c884504afdee494624c9 /package | |
| parent | 9d5c868c04f53ac4d3c369e7596bdcfa512e289b (diff) | |
oox: don't trim the default sequences
Change-Id: Iefa4bd729b0d4ab1dab870b16e7cbe29ac08a49a
Reviewed-on: https://gerrit.libreoffice.org/69721
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 346f509d2250..9527140e7d47 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1085,11 +1085,8 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: pEntry->nSize = pEntry->nCompressedSize = -1; pEntry->nTime = ZipOutputStream::getCurrentDosTime(); - // Convert vector into a uno::Sequence - // TODO/LATER: use Default entries in future + // Add default entries, the count must be updated manually when appending. uno::Sequence< beans::StringPair > aDefaultsSequence(4); - // Add at least the standard default entries. - sal_Int32 nDefSeqLength = 1; aDefaultsSequence[0].First = "xml"; aDefaultsSequence[0].Second= "application/xml"; aDefaultsSequence[1].First = "rels"; @@ -1122,7 +1119,6 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: } } aOverridesSequence.realloc(nOverSeqLength); - aDefaultsSequence.realloc(nDefSeqLength); ::comphelper::OFOPXMLHelper::WriteContentSequence( xConTypeOutStream, aDefaultsSequence, aOverridesSequence, m_xContext ); |