sfx2: make SfxDispatcher::Execute() less variadic ...

... and less overloaded; C++11 initializer_list should make undefined
behavior as fixed in ba0a866b83f016fd460320e7d057dd107e019f19 less
likely.

Change-Id: I15cc0804451b6a4fcbfaa623f9a30db222207865
Reviewed-on: https://gerrit.libreoffice.org/23666
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

6 files changed, 36 insertions, 36 deletions

diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 131e510cc1ea..36c5b95b815e 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -309,9 +309,9 @@ void LibBox::NotifyIDE()
         OUString aLibName = pEntry->GetLibName();
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
-            pDispatcher->Execute(
-                SID_BASICIDE_LIBSELECTED,
-                SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, nullptr
+            pDispatcher->ExecuteList(
+                SID_BASICIDE_LIBSELECTED, SfxCallMode::SYNCHRON,
+                { &aDocumentItem, &aLibNameItem }
             );
     }
     ReleaseFocus();
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 652d53f4e504..6d450e217a2a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -930,9 +930,9 @@ bool TreeListBox::OpenCurrent()
                     aDesc.GetLibName(), aDesc.GetName(), aDesc.GetMethodName(),
                     ConvertType(aDesc.GetType())
                 );
-                pDispatcher->Execute(
-                    SID_BASICIDE_SHOWSBX,
-                    SfxCallMode::SYNCHRON, &aSbxItem, nullptr
+                pDispatcher->ExecuteList(
+                    SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON,
+                    { &aSbxItem }
                 );
                 return true;
             }
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index ae6a9375f3f8..d0ab4a3c0658 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -554,8 +554,8 @@ void TabBar::EndRenaming()
         SfxUInt16Item aID( SID_BASICIDE_ARG_TABID, GetEditPageId() );
         SfxStringItem aNewName( SID_BASICIDE_ARG_MODULENAME, GetEditText() );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
-            pDispatcher->Execute( SID_BASICIDE_NAMECHANGEDONTAB,
-                      SfxCallMode::SYNCHRON, &aID, &aNewName, nullptr);
+            pDispatcher->ExecuteList( SID_BASICIDE_NAMECHANGEDONTAB,
+                      SfxCallMode::SYNCHRON, { &aID, &aNewName });
     }
 }
 
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 4070b5062de5..894c23a7ef67 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -679,8 +679,8 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
 
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
-                pDispatcher->Execute(SID_BASICIDE_EDITMACRO,
-                        SfxCallMode::ASYNCHRON, &aInfoItem, nullptr);
+                pDispatcher->ExecuteList(SID_BASICIDE_EDITMACRO,
+                        SfxCallMode::ASYNCHRON, { &aInfoItem });
             }
             EndDialog(Macro_Edit);
         }
@@ -691,8 +691,8 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
                 DeleteMacro();
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
                 {
-                    pDispatcher->Execute( SID_BASICIDE_UPDATEMODULESOURCE,
-                                  SfxCallMode::SYNCHRON, &aInfoItem, nullptr);
+                    pDispatcher->ExecuteList( SID_BASICIDE_UPDATEMODULESOURCE,
+                                  SfxCallMode::SYNCHRON, { &aInfoItem });
                 }
                 CheckButtons();
                 UpdateFields();
@@ -720,8 +720,8 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
 
                     if (SfxDispatcher* pDispatcher = GetDispatcher())
                     {
-                        pDispatcher->Execute(SID_BASICIDE_EDITMACRO,
-                                SfxCallMode::ASYNCHRON, &aInfoItem, nullptr);
+                        pDispatcher->ExecuteList(SID_BASICIDE_EDITMACRO,
+                                SfxCallMode::ASYNCHRON, { &aInfoItem });
                     }
                     StoreMacroDescription();
                     EndDialog(Macro_New);
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a2632191b50d..cd700809f804 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -631,8 +631,8 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
         OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
-            pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
-                SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, nullptr);
+            pDispatcher->ExecuteList( SID_BASICIDE_LIBSELECTED,
+                SfxCallMode::ASYNCHRON, { &aDocItem, &aLibNameItem });
         EndTabDialog();
         return;
     }
@@ -1355,8 +1355,8 @@ void LibPage::DeleteCurrent()
         SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
-            pDispatcher->Execute( SID_BASICIDE_LIBREMOVED,
-                                  SfxCallMode::SYNCHRON, &aDocItem, &aLibNameItem, 0 );
+            pDispatcher->ExecuteList(SID_BASICIDE_LIBREMOVED,
+                      SfxCallMode::SYNCHRON, { &aDocItem, &aLibNameItem });
 
         // remove library from module and dialog library containers
         if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
@@ -1534,8 +1534,8 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
 
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
-                    pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                                          SfxCallMode::SYNCHRON, &aSbxItem, 0 );
+                    pDispatcher->ExecuteList(SID_BASICIDE_SBXINSERTED,
+                                          SfxCallMode::SYNCHRON, { &aSbxItem });
 
                 if( pBasicBox )
                 {
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 982f77dfa279..bf5b6ae32a89 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -121,8 +121,8 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT
     if (SfxDispatcher* pDispatcher = GetDispatcher())
     {
         SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, rNewText, ConvertType( eType ) );
-        pDispatcher->Execute( SID_BASICIDE_SBXRENAMED,
-                            SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+        pDispatcher->ExecuteList( SID_BASICIDE_SBXRENAMED,
+                            SfxCallMode::SYNCHRON, { &aSbxItem });
     }
 
     // OV-Bug?!
@@ -354,8 +354,8 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
             if( pDispatcher )
             {
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rSourceDoc, aSourceLibName, aSourceName, ConvertType( eType ) );
-                pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
-                      SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+                pDispatcher->ExecuteList( SID_BASICIDE_SBXDELETED,
+                      SfxCallMode::SYNCHRON, { &aSbxItem });
             }
         }
 
@@ -446,8 +446,8 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
         if( pDispatcher )
         {
             SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDestDoc, aDestLibName, aSourceName, ConvertType( eType ) );
-            pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                                  SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+            pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
+                                  SfxCallMode::SYNCHRON, { &aSbxItem });
         }
     }
 
@@ -717,8 +717,8 @@ IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
                 }
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
                                   aModName, TreeListBox::ConvertType( aDesc.GetType() ) );
-                pDispatcher->Execute(SID_BASICIDE_SHOWSBX,
-                        SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+                pDispatcher->ExecuteList(SID_BASICIDE_SHOWSBX,
+                        SfxCallMode::SYNCHRON, { &aSbxItem });
             }
         }
         else    // Nur Lib selektiert
@@ -737,8 +737,8 @@ IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
             SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
             if ( pDispatcher )
             {
-                pDispatcher->Execute(SID_BASICIDE_LIBSELECTED,
-                    SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, nullptr);
+                pDispatcher->ExecuteList(SID_BASICIDE_LIBSELECTED,
+                    SfxCallMode::ASYNCHRON, { &aDocItem, &aLibNameItem });
             }
         }
         EndTabDialog();
@@ -844,8 +844,8 @@ void ObjectPage::NewDialog()
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, TYPE_DIALOG );
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
                 {
-                    pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                        SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+                    pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
+                        SfxCallMode::SYNCHRON, { &aSbxItem });
                 }
                 LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
                 SvTreeListEntry* pRootEntry = m_pBasicBox->FindRootEntry( aDocument, eLocation );
@@ -900,8 +900,8 @@ void ObjectPage::DeleteCurrent()
         if (SfxDispatcher* pDispatcher = GetDispatcher())
         {
             SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aName, TreeListBox::ConvertType( eType ) );
-            pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
-                                  SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+            pDispatcher->ExecuteList( SID_BASICIDE_SBXDELETED,
+                                  SfxCallMode::SYNCHRON, { &aSbxItem });
         }
 
         try
@@ -1003,8 +1003,8 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
             if (SfxDispatcher* pDispatcher = GetDispatcher())
             {
-                pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                      SfxCallMode::SYNCHRON, &aSbxItem, nullptr);
+                pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
+                      SfxCallMode::SYNCHRON, { &aSbxItem });
             }
             LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
             SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );