summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-06-08 21:39:34 +0200
committerJulien Nabet <serval2412@yahoo.fr>2021-06-09 10:49:26 +0200
commit7af40a445551a07c6918f835da20ca461a6bd4ee (patch)
tree3f6816c85dd0e4008dc022e6e0a37079d7590881 /package
parent07a09195adc65722207390e355a202100bc608ff (diff)
Simplify Sequences initializations (i*->p*)
Change-Id: I6bf0eaa2233de2487d90a2f9ae7de263b4ddf1bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116865 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackage.cxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c31697f24184..6afba83a49e5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1090,16 +1090,14 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
pEntry->nTime = ZipOutputStream::getCurrentDosTime();
// Add default entries, the count must be updated manually when appending.
- uno::Sequence< beans::StringPair > aDefaultsSequence(4);
// Add at least the standard default entries.
- aDefaultsSequence[0].First = "xml";
- aDefaultsSequence[0].Second= "application/xml";
- aDefaultsSequence[1].First = "rels";
- aDefaultsSequence[1].Second= "application/vnd.openxmlformats-package.relationships+xml";
- aDefaultsSequence[2].First = "png";
- aDefaultsSequence[2].Second= "image/png";
- aDefaultsSequence[3].First = "jpeg";
- aDefaultsSequence[3].Second= "image/jpeg";
+ uno::Sequence< beans::StringPair > aDefaultsSequence
+ {
+ { "xml", "application/xml" },
+ { "rels", "application/vnd.openxmlformats-package.relationships+xml" },
+ { "png", "image/png" },
+ { "jpeg", "image/jpeg" }
+ };
uno::Sequence< beans::StringPair > aOverridesSequence(aManList.size());
sal_Int32 nOverSeqLength = 0;