From 027b25ecd54ac97ea2471ca73e3ba89ce052fe76 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 9 Jun 2017 13:43:00 +0200
Subject: use comphelper::InitPropertySequence in more places

Change-Id: I72d7b13a23ce306b752b39187a0e9fbb7028643a
Reviewed-on: https://gerrit.libreoffice.org/38606
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 xmlsecurity/qa/unit/signing/signing.cxx | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'xmlsecurity/qa')

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index f8fe7b55123d..c0389fe40a3c 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/packages/manifest/ManifestReader.hpp>
 
 #include <comphelper/processfactory.hxx>
+#include <comphelper/propertysequence.hxx>
 #include <sax/tools/converter.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
@@ -491,11 +492,10 @@ void SigningTest::test96097Calc()
     // Save a copy
     utl::TempFile aTempFileSaveCopy;
     aTempFileSaveCopy.EnableKillingFile();
-    uno::Sequence<beans::PropertyValue> descSaveACopy(2);
-    descSaveACopy[0].Name = "SaveACopy";
-    descSaveACopy[0].Value <<= true;
-    descSaveACopy[1].Name = "FilterName";
-    descSaveACopy[1].Value <<= OUString("calc8");
+    uno::Sequence<beans::PropertyValue> descSaveACopy( comphelper::InitPropertySequence({
+        { "SaveACopy", uno::Any(true) },
+        { "FilterName", uno::Any(OUString("calc8")) }
+    }));
     xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
 
     try
@@ -503,9 +503,9 @@ void SigningTest::test96097Calc()
         // Save As
         utl::TempFile aTempFileSaveAs;
         aTempFileSaveAs.EnableKillingFile();
-        uno::Sequence<beans::PropertyValue> descSaveAs(1);
-        descSaveAs[0].Name = "FilterName";
-        descSaveAs[0].Value <<= OUString("calc8");
+        uno::Sequence<beans::PropertyValue> descSaveAs( comphelper::InitPropertySequence({
+            { "FilterName", uno::Any(OUString("calc8")) }
+        }));
         xDocStorable->storeAsURL(aTempFileSaveAs.GetURL(), descSaveAs);
     }
     catch (...)
@@ -539,11 +539,10 @@ void SigningTest::test96097Doc()
     // Save a copy
     utl::TempFile aTempFileSaveCopy;
     aTempFileSaveCopy.EnableKillingFile();
-    uno::Sequence<beans::PropertyValue> descSaveACopy(2);
-    descSaveACopy[0].Name = "SaveACopy";
-    descSaveACopy[0].Value <<= true;
-    descSaveACopy[1].Name = "FilterName";
-    descSaveACopy[1].Value <<= OUString("writer8");
+    uno::Sequence<beans::PropertyValue> descSaveACopy( comphelper::InitPropertySequence({
+        { "SaveACopy", uno::Any(true) },
+        { "FilterName", uno::Any(OUString("writer8")) }
+    }));
     xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
 
     try
@@ -551,9 +550,9 @@ void SigningTest::test96097Doc()
         // Save As
         utl::TempFile aTempFileSaveAs;
         aTempFileSaveAs.EnableKillingFile();
-        uno::Sequence<beans::PropertyValue> descSaveAs(1);
-        descSaveAs[0].Name = "FilterName";
-        descSaveAs[0].Value <<= OUString("writer8");
+        uno::Sequence<beans::PropertyValue> descSaveAs( comphelper::InitPropertySequence({
+            { "FilterName", uno::Any(OUString("writer8")) }
+        }));
         xDocStorable->storeAsURL(aTempFileSaveAs.GetURL(), descSaveAs);
     }
     catch (...)
-- 
cgit