Prepare for removal of non-const operator[] from Sequence in slideshow

Change-Id: Ic3d4835a6153ce3451e5ddf7a74310ea2b70da2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124389
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

3 files changed, 25 insertions, 28 deletions

diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 0f8644cd3da8..6a803f757711 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/compbase.hxx>
 
 #include <comphelper/fileformat.h>
+#include <comphelper/propertyvalue.hxx>
 
 #include <vcl/canvastools.hxx>
 #include <vcl/metaact.hxx>
@@ -174,29 +175,22 @@ GDIMetaFileSharedPtr getMetaFile( const uno::Reference< lang::XComponent >&
     uno::Reference< drawing::XGraphicExportFilter > xExporter =
         drawing::GraphicExportFilter::create(rxContext);
 
-    uno::Sequence< beans::PropertyValue > aProps(3);
-    aProps[0].Name = "FilterName";
-    aProps[0].Value <<= OUString("SVM");
-
-    aProps[1].Name = "GraphicRenderer";
-    aProps[1].Value <<= uno::Reference< graphic::XGraphicRenderer >(xRenderer);
-
-    uno::Sequence< beans::PropertyValue > aFilterData(4);
-    aFilterData[0].Name = "ScrollText";
-    aFilterData[0].Value <<= ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0);
-
-    aFilterData[1].Name = "ExportOnlyBackground";
-    aFilterData[1].Value <<= ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0);
-
-    aFilterData[2].Name = "Version";
-    aFilterData[2].Value <<= static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 );
-
-    aFilterData[3].Name = "CurrentPage";
-    aFilterData[3].Value <<= uno::Reference< uno::XInterface >( xContainingPage,
-                                                                uno::UNO_QUERY_THROW );
-
-    aProps[2].Name = "FilterData";
-    aProps[2].Value <<= aFilterData;
+    uno::Sequence< beans::PropertyValue > aFilterData{
+        comphelper::makePropertyValue("ScrollText",
+                                      ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0)),
+        comphelper::makePropertyValue("ExportOnlyBackground",
+                                      ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0)),
+        comphelper::makePropertyValue("Version", static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 )),
+        comphelper::makePropertyValue(
+            "CurrentPage", uno::Reference< uno::XInterface >( xContainingPage,
+                                                              uno::UNO_QUERY_THROW ))
+    };
+
+    uno::Sequence< beans::PropertyValue > aProps{
+        comphelper::makePropertyValue("FilterName", OUString("SVM")),
+        comphelper::makePropertyValue("GraphicRenderer", uno::Reference< graphic::XGraphicRenderer >(xRenderer)),
+        comphelper::makePropertyValue("FilterData", aFilterData)
+    };
 
     xExporter->setSourceDocument( xSource );
     if( !xExporter->filter( aProps ) )
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 2179f71ba78c..52a86be889d7 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -433,17 +433,19 @@ namespace slideshow::internal
 
                         if( mxPlayer.is() )
                         {
-                            uno::Sequence< uno::Any >   aArgs( 3 );
                             sal_IntPtr nParentWindowHandle(0);
                             const SystemEnvData* pEnvData = mpMediaWindow->GetSystemData();
                             // tdf#139609 gtk doesn't need the handle, and fetching it is undesirable
                             if (!pEnvData || pEnvData->toolkit != SystemEnvData::Toolkit::Gtk)
                                 nParentWindowHandle = mpMediaWindow->GetParentWindowHandle();
 
-                            aArgs[ 0 ] <<= nParentWindowHandle;
                             aAWTRect.X = aAWTRect.Y = 0;
-                            aArgs[ 1 ] <<= aAWTRect;
-                            aArgs[ 2 ] <<= reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() );
+
+                            uno::Sequence< uno::Any >   aArgs{
+                                uno::Any(nParentWindowHandle),
+                                uno::Any(aAWTRect),
+                                uno::Any(reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() ))
+                            };
 
                             mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) );
 
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index b159bc6c2778..035b6e6e1a98 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -340,11 +340,12 @@ namespace slideshow::internal
 
         // output to result sequence
         uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() );
+        auto aResRange = asNonConstRange(aRes);
 
         ::std::size_t                       nCurrIndex(0);
         for( const auto& rIter : aShapeHash )
         {
-            animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] );
+            animations::TargetProperties& rCurrProps( aResRange[ nCurrIndex++ ] );
 
             if( rIter.first.mnParagraphIndex == -1 )
             {