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

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

4 files changed, 13 insertions, 16 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 085228971eae..23eb5ab1e0eb 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1010,13 +1010,14 @@ bool implImportDialog(weld::Window* pWin, const ScriptDocument& rDocument, const
                     if( nOnlyInImportLanguageCount > 1 )
                     {
                         Sequence< lang::Locale > aRemainingLocaleSeq( nOnlyInImportLanguageCount - 1 );
+                        auto pRemainingLocaleSeq = aRemainingLocaleSeq.getArray();
                         lang::Locale aTmpLocale;
                         int iSeq = 0;
                         for( int i = 0 ; i < nOnlyInImportLanguageCount ; ++i )
                         {
                             aTmpLocale = aOnlyInImportLanguages[i];
                             if( !localesAreEqual( aFirstLocale, aTmpLocale ) )
-                                aRemainingLocaleSeq[iSeq++] = aTmpLocale;
+                                pRemainingLocaleSeq[iSeq++] = aTmpLocale;
                         }
                         pCurMgr->handleAddLocales( aRemainingLocaleSeq );
                     }
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 203fa9cc44b9..13ff7a17ca36 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -182,8 +182,14 @@ DlgEditor::DlgEditor (
     ,pVScroll(nullptr)
     ,pDlgEdModel(new DlgEdModel())
     ,pDlgEdPage(new DlgEdPage(*pDlgEdModel))
-    ,m_ClipboardDataFlavors(1)
-    ,m_ClipboardDataFlavorsResource(2)
+    // set clipboard data flavors
+    ,m_ClipboardDataFlavors{ { /* MimeType */ "application/vnd.sun.xml.dialog",
+                               /* HumanPresentableName */ "Dialog 6.0",
+                               /* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
+    ,m_ClipboardDataFlavorsResource{ m_ClipboardDataFlavors[0],
+                                     { /* MimeType */ "application/vnd.sun.xml.dialogwithresource",
+                                       /* HumanPresentableName */ "Dialog 8.0",
+                                       /* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
     ,pObjFac(new DlgEdFactory(xModel))
     ,rWindow(rWindow_)
     ,pFunc(new DlgEdFuncSelect(*this))
@@ -207,16 +213,6 @@ DlgEditor::DlgEditor (
 
     pDlgEdModel->InsertPage(pDlgEdPage);
 
-    // set clipboard data flavors
-    m_ClipboardDataFlavors[0].MimeType =             "application/vnd.sun.xml.dialog" ;
-    m_ClipboardDataFlavors[0].HumanPresentableName = "Dialog 6.0" ;
-    m_ClipboardDataFlavors[0].DataType =             cppu::UnoType<Sequence< sal_Int8 >>::get();
-
-    m_ClipboardDataFlavorsResource[0] =                      m_ClipboardDataFlavors[0];
-    m_ClipboardDataFlavorsResource[1].MimeType =             "application/vnd.sun.xml.dialogwithresource" ;
-    m_ClipboardDataFlavorsResource[1].HumanPresentableName = "Dialog 8.0" ;
-    m_ClipboardDataFlavorsResource[1].DataType =             cppu::UnoType<Sequence< sal_Int8 >>::get();
-
     aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) );
 
     rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 6353ddf9ecd6..c9ae1de4ae6e 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1685,8 +1685,7 @@ void DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
     aValue.Name = "BoundCell";
     aValue.Value <<= aApiAddress;
 
-    Sequence< Any > aArgs( 1 );
-    aArgs[ 0 ] <<= aValue;
+    Sequence< Any > aArgs{ Any(aValue) };
 
     if ( xBindable.is() )
     {
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index d36c23803e7a..c7cd423cccee 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -162,12 +162,13 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, weld::Button&, void)
     int nPos = m_xLanguageLB->get_selected_index();
     // remove locales
     Sequence< Locale > aLocaleSeq( nCount );
+    auto aLocaleSeqRange = asNonConstRange(aLocaleSeq);
     for (int i = 0; i < nCount; ++i)
     {
         const sal_Int32 nSelPos = aSelection[i];
         LanguageEntry* pEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(nSelPos).toInt64());
         if ( pEntry )
-            aLocaleSeq[i] = pEntry->m_aLocale;
+            aLocaleSeqRange[i] = pEntry->m_aLocale;
     }
     m_xLocalizationMgr->handleRemoveLocales( aLocaleSeq );
     // update listbox