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>

4 files changed, 39 insertions, 48 deletions

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index fa27beca817d..7ee048ad4b70 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -46,6 +46,7 @@
 #include <sfx2/sfxmodelfactory.hxx>
 #include <svl/intitem.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/propertysequence.hxx>
 #include <comphelper/scopeguard.hxx>
 
 #include <basic/sbxdef.hxx>
@@ -410,9 +411,9 @@ void SwMacrosTest::testFdo68983()
 
     utl::TempFile aTempFile;
     aTempFile.EnableKillingFile();
-    Sequence<beans::PropertyValue> desc(1);
-    desc[0].Name = "FilterName";
-    desc[0].Value <<= OUString("writer8");
+    Sequence<beans::PropertyValue> desc( comphelper::InitPropertySequence({
+            { "FilterName", Any(OUString("writer8")) }
+        }));
     xDocStorable->storeAsURL(aTempFile.GetURL(), desc);
 
     Reference<util::XCloseable>(xComponent, UNO_QUERY_THROW)->close(false);
@@ -443,9 +444,9 @@ void SwMacrosTest::testFdo87530()
     utl::TempFile aTempFile;
     aTempFile.EnableKillingFile();
 
-    Sequence<beans::PropertyValue> desc(1);
-    desc[0].Name = "FilterName";
-    desc[0].Value <<= OUString("writer8");
+    Sequence<beans::PropertyValue> desc( comphelper::InitPropertySequence({
+            { "FilterName", Any(OUString("writer8")) }
+        }));
 
     {
         // insert initial password protected library
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 0fcc0a48e2a2..cc152f422c2f 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/propertysequence.hxx>
 #include <unotxdoc.hxx>
 #include <docsh.hxx>
 #include <IDocumentRedlineAccess.hxx>
@@ -767,11 +768,9 @@ void Test::testSkipImages()
         if (bSkipImages)
         {
             // FilterOptions parameter
-            uno::Sequence<beans::PropertyValue> args(1);
-            args[0].Name = "FilterOptions";
-            args[0].Handle = -1;
-            args[0].Value <<= OUString::createFromAscii(aFilterNames[nFilter][1]);
-            args[0].State = beans::PropertyState_DIRECT_VALUE;
+            uno::Sequence<beans::PropertyValue> args( comphelper::InitPropertySequence({
+                    { "FilterOptions", uno::Any(OUString::createFromAscii(aFilterNames[nFilter][1])) }
+            }));
             mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aFilterNames[nFilter][0]), "com.sun.star.text.TextDocument", args);
             sFailedMessage = sFailedMessage + " - " + aFilterNames[nFilter][1];
         } else
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2d4804e937af..4f76f5f321cb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -101,11 +101,9 @@ public:
                 CPPUNIT_ASSERT_MESSAGE("no desktop", mxDesktop.is());
                 uno::Reference<frame::XComponentLoader> xLoader(mxDesktop, uno::UNO_QUERY);
                 CPPUNIT_ASSERT_MESSAGE("no loader", xLoader.is());
-                uno::Sequence<beans::PropertyValue> args(1);
-                args[0].Name = "DocumentService";
-                args[0].Handle = -1;
-                args[0].Value <<= OUString("com.sun.star.text.TextDocument");
-                args[0].State = beans::PropertyState_DIRECT_VALUE;
+                uno::Sequence<beans::PropertyValue> args( comphelper::InitPropertySequence({
+                        { "DocumentService", uno::Any(OUString("com.sun.star.text.TextDocument")) }
+                    }));
 
                 uno::Reference<lang::XComponent> xComponent = xLoader->loadComponentFromURL(aURL, "_default", 0, args);
                 OUString sMessage = "loading succeeded: " + aURL;
@@ -1243,11 +1241,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf100072, "tdf100072.docx")
 
     SvMemoryStream aStream;
     uno::Reference<io::XOutputStream> xOutputStream(new utl::OStreamWrapper(aStream));
-    uno::Sequence<beans::PropertyValue> aDescriptor =
-    {
-        beans::PropertyValue("OutputStream", sal_Int32(0), uno::makeAny(xOutputStream), beans::PropertyState_DIRECT_VALUE),
-        beans::PropertyValue("FilterName", sal_Int32(0), uno::makeAny(OUString("SVM")), beans::PropertyState_DIRECT_VALUE)
-    };
+    uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({
+            { "OutputStream", uno::Any(xOutputStream) },
+            { "FilterName", uno::Any(OUString("SVM")) }
+        }));
     xGraphicExporter->filter(aDescriptor);
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3239e1b2184d..7ef2dabaf0d4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1374,11 +1374,10 @@ void SwUiWriterTest::testFdo87448()
 
     SvMemoryStream aStream;
     uno::Reference<io::XOutputStream> xOutputStream(new utl::OStreamWrapper(aStream));
-    uno::Sequence<beans::PropertyValue> aDescriptor =
-    {
-        beans::PropertyValue("OutputStream", sal_Int32(0), uno::makeAny(xOutputStream), beans::PropertyState_DIRECT_VALUE),
-        beans::PropertyValue("FilterName", sal_Int32(0), uno::makeAny(OUString("SVM")), beans::PropertyState_DIRECT_VALUE)
-    };
+    uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({
+            { "OutputStream", uno::makeAny(xOutputStream) },
+            { "FilterName", uno::makeAny(OUString("SVM")) }
+        }));
     xGraphicExporter->filter(aDescriptor);
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
@@ -1626,10 +1625,9 @@ void SwUiWriterTest::testXFlatParagraph()
     uno::Reference<text::XFlatParagraph> xFlatPara4(xFPIterator->getParaBefore(xFlatPara3));
     CPPUNIT_ASSERT_EQUAL(xFlatPara2->getText(), xFlatPara4->getText());
     //changing the attributes of last para
-    uno::Sequence<beans::PropertyValue> aDescriptor =
-    {
-        beans::PropertyValue("CharWeight", sal_Int32(0), uno::makeAny(float(css::awt::FontWeight::BOLD)), beans::PropertyState_DIRECT_VALUE)
-    };
+    uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({
+         { "CharWeight", uno::Any(float(css::awt::FontWeight::BOLD)) }
+    }));
     xFlatPara3->changeAttributes(sal_Int32(0), sal_Int32(5), aDescriptor);
     //checking Language Portions
     uno::Sequence<::sal_Int32> aLangPortions(xFlatPara4->getLanguagePortions());
@@ -1680,16 +1678,14 @@ void SwUiWriterTest::testTdf81995()
 void SwUiWriterTest::testExportToPicture()
 {
     createDoc();
-    uno::Sequence<beans::PropertyValue> aFilterData =
-    {
-        beans::PropertyValue("PixelWidth", sal_Int32(0), uno::makeAny(sal_Int32(610)), beans::PropertyState_DIRECT_VALUE),
-        beans::PropertyValue("PixelHeight", sal_Int32(0), uno::makeAny(sal_Int32(610)), beans::PropertyState_DIRECT_VALUE)
-    };
-    uno::Sequence<beans::PropertyValue> aDescriptor =
-    {
-        beans::PropertyValue("FilterName", sal_Int32(0), uno::makeAny(OUString("writer_png_Export")), beans::PropertyState_DIRECT_VALUE),
-        beans::PropertyValue("FilterData", sal_Int32(0), uno::makeAny(aFilterData), beans::PropertyState_DIRECT_VALUE)
-    };
+    uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({
+        { "PixelWidth", uno::Any(sal_Int32(610)) },
+        { "PixelHeight", uno::Any(sal_Int32(610)) }
+    }));
+    uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({
+        { "FilterName", uno::Any(OUString("writer_png_Export")) },
+        { "FilterData", uno::Any(aFilterData) }
+    }));
     utl::TempFile aTempFile;
     uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
     xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
@@ -1821,10 +1817,9 @@ void SwUiWriterTest::testTextSearch()
     uno::Reference<util::XSearchDescriptor> xSearchDes(xSearch->createSearchDescriptor(), uno::UNO_QUERY);
     uno::Reference<util::XPropertyReplace> xProp(xSearchDes, uno::UNO_QUERY);
     //setting some properties
-    uno::Sequence<beans::PropertyValue> aDescriptor =
-    {
-        beans::PropertyValue("CharWeight", sal_Int32(0), uno::makeAny(float(css::awt::FontWeight::BOLD)), beans::PropertyState_DIRECT_VALUE)
-    };
+    uno::Sequence<beans::PropertyValue> aDescriptor( comphelper::InitPropertySequence({
+        { "CharWeight", uno::Any(float(css::awt::FontWeight::BOLD)) }
+    }));
     xProp->setSearchAttributes(aDescriptor);
     //receiving the defined properties and asserting them with expected values, covering UNO
     uno::Sequence<beans::PropertyValue> aPropVal2(xProp->getSearchAttributes());
@@ -4589,10 +4584,9 @@ void SwUiWriterTest::testLandscape()
 {
     // Set page orientation to landscape.
     SwDoc* pDoc = createDoc();
-    uno::Sequence<beans::PropertyValue> aPropertyValues =
-    {
-        comphelper::makePropertyValue("AttributePage.Landscape", true),
-    };
+    uno::Sequence<beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence({
+        { "AttributePage.Landscape", uno::Any(true) }
+    }));
     lcl_dispatchCommand(mxComponent, ".uno:AttributePage", aPropertyValues);
     Scheduler::ProcessEventsToIdle();