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

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

4 files changed, 15 insertions, 14 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 3bd6a5946ddf..19c314da2635 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1577,10 +1577,6 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
     if(!xInit.is())
         return;
 
-    uno::Sequence< uno::Any > aArguments(5);
-    aArguments[0] <<= uno::Reference<view::XSelectionSupplier>(this);
-    aArguments[1] <<= getModel();
-    aArguments[2] <<= m_xChartView;
     uno::Reference< XAccessible > xParent;
     {
         SolarMutexGuard aGuard;
@@ -1592,8 +1588,11 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
                 xParent.set( pParentWin->GetAccessible());
         }
     }
-    aArguments[3] <<= xParent;
-    aArguments[4] <<= m_xViewWindow;
+    uno::Sequence< uno::Any > aArguments{ uno::Any(uno::Reference<view::XSelectionSupplier>(this)),
+                                          uno::Any(getModel()),
+                                          uno::Any(m_xChartView),
+                                          uno::Any(xParent),
+                                          uno::Any(m_xViewWindow) };
 
     xInit->initialize(aArguments);
 }
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 1d58ddc70b40..92a7f9f16851 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1271,10 +1271,11 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
             }
         }
 
-        css::uno::Sequence< css::uno::Any > aArgs( 3 );
-        aArgs[0] <<= comphelper::makePropertyValue( "IsContextMenu", true );
-        aArgs[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame );
-        aArgs[2] <<= comphelper::makePropertyValue( "Value", aMenuName );
+        css::uno::Sequence< css::uno::Any > aArgs{
+            css::uno::Any(comphelper::makePropertyValue( "IsContextMenu", true )),
+            css::uno::Any(comphelper::makePropertyValue( "Frame", m_xFrame )),
+            css::uno::Any(comphelper::makePropertyValue( "Value", aMenuName ))
+        };
 
         css::uno::Reference< css::frame::XPopupMenuController > xPopupController(
             m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext(
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index daea97d4c7bf..69528aa67fa1 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -144,11 +144,12 @@ Sequence< Reference< frame::XDispatch > > CommandDispatchContainer::getDispatche
 {
     sal_Int32 nCount = aDescriptors.getLength();
     uno::Sequence< uno::Reference< frame::XDispatch > > aRet( nCount );
+    auto aRetRange = asNonConstRange(aRet);
 
     for( sal_Int32 nPos = 0; nPos < nCount; ++nPos )
     {
         if ( aDescriptors[ nPos ].FrameName == "_self" )
-            aRet[ nPos ] = getDispatchForURL( aDescriptors[ nPos ].FeatureURL );
+            aRetRange[ nPos ] = getDispatchForURL( aDescriptors[ nPos ].FeatureURL );
     }
     return aRet;
 }
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 4040c8db1b8d..54a94adfa083 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -64,11 +64,11 @@ FieldUnit CalcConfigItem::getFieldUnit()
 {
     FieldUnit eResult( FieldUnit::CM );
 
-    uno::Sequence< OUString > aNames( 1 );
+    uno::Sequence< OUString > aNames;
     if( lcl_IsMetric() )
-        aNames[ 0 ] = "Other/MeasureUnit/Metric";
+        aNames = { "Other/MeasureUnit/Metric" };
     else
-        aNames[ 0 ] = "Other/MeasureUnit/NonMetric";
+        aNames = { "Other/MeasureUnit/NonMetric" };
 
     uno::Sequence< uno::Any > aResult( GetProperties( aNames ));
     sal_Int32 nValue = 0;