convert SFX_CALLMODE constants to SfxCallMode enum class

and fix a couple of bugs in SC and SW where the call mode was
being passed to the hints parameter by accident

Change-Id: Ief805410b3f7035e012e229e77f92d5832430f58
Reviewed-on: https://gerrit.libreoffice.org/11916
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 24 insertions, 24 deletions

diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 5699f1aacd95..04044942b832 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -322,7 +322,7 @@ void LibBox::NotifyIDE()
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute(
                 SID_BASICIDE_LIBSELECTED,
-                SFX_CALLMODE_SYNCHRON, &aDocumentItem, &aLibNameItem, 0L
+                SfxCallMode::SYNCHRON, &aDocumentItem, &aLibNameItem, 0L
             );
     }
     ReleaseFocus();
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 288900794dba..11553841b4b6 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -422,7 +422,7 @@ long HandleBasicError( StarBASIC* pBasic )
                 if ( !pShell )
                 {
                     SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
-                    SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
+                    SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
                     SfxGetpApp()->ExecuteSlot( aRequest );
                     pShell = GetShell();
                 }
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 42f7b0d9deb1..05894ade15b2 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -953,7 +953,7 @@ bool TreeListBox::OpenCurrent()
                 );
                 pDispatcher->Execute(
                     SID_BASICIDE_SHOWSBX,
-                    SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L
+                    SfxCallMode::SYNCHRON, &aSbxItem, 0L
                 );
                 return true;
             }
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 994ad6eafdd3..55a3dc4b2976 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -562,7 +562,7 @@ void TabBar::EndRenaming()
         SfxStringItem aNewName( SID_BASICIDE_ARG_MODULENAME, GetEditText() );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute( SID_BASICIDE_NAMECHANGEDONTAB,
-                                  SFX_CALLMODE_SYNCHRON, &aID, &aNewName, 0L );
+                                  SfxCallMode::SYNCHRON, &aID, &aNewName, 0L );
     }
 }
 
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index a88cca451cc2..5079378544e2 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -675,11 +675,11 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                 aInfoItem.SetMethod( m_pMacroBox->GetEntryText( pEntry ) );
             StoreMacroDescription();
             SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
-            SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
+            SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
             SfxGetpApp()->ExecuteSlot( aRequest );
 
             if (SfxDispatcher* pDispatcher = GetDispatcher())
-                pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SFX_CALLMODE_ASYNCHRON, &aInfoItem, 0L );
+                pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SfxCallMode::ASYNCHRON, &aInfoItem, 0L );
             EndDialog(Macro_Edit);
         }
         else
@@ -689,7 +689,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                 DeleteMacro();
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
                     pDispatcher->Execute( SID_BASICIDE_UPDATEMODULESOURCE,
-                                          SFX_CALLMODE_SYNCHRON, &aInfoItem, 0L );
+                                          SfxCallMode::SYNCHRON, &aInfoItem, 0L );
                 CheckButtons();
                 UpdateFields();
                 //if ( m_pMacroBox->GetCurEntry() )    // OV-Bug ?
@@ -711,11 +711,11 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                     aInfoItem.SetModule( pMethod->GetModule()->GetName() );
                     aInfoItem.SetLib( pMethod->GetModule()->GetParent()->GetName() );
                     SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
-                    SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
+                    SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
                     SfxGetpApp()->ExecuteSlot( aRequest );
 
                     if (SfxDispatcher* pDispatcher = GetDispatcher())
-                        pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SFX_CALLMODE_ASYNCHRON, &aInfoItem, 0L );
+                        pDispatcher->Execute( SID_BASICIDE_EDITMACRO, SfxCallMode::ASYNCHRON, &aInfoItem, 0L );
                     StoreMacroDescription();
                     EndDialog(Macro_New);
                 }
@@ -740,7 +740,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         OUString aComment( GetInfo( pMethod ) );
         SfxMacroInfoItem aItem( SID_MACROINFO, pBasMgr, aLib, aMod, aSub, aComment );
         SfxAllItemSet Args( SfxGetpApp()->GetPool() );
-        SfxRequest aRequest( SID_CONFIG, SFX_CALLMODE_SYNCHRON, Args );
+        SfxRequest aRequest( SID_CONFIG, SfxCallMode::SYNCHRON, Args );
         aRequest.AppendItem( aItem );
         SfxGetpApp()->ExecuteSlot( aRequest );
     }
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 15e16dbfb999..e6e81877466d 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -579,7 +579,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
     if (pButton == m_pEditButton)
     {
         SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
-        SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
+        SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
         SfxGetpApp()->ExecuteSlot( aRequest );
 
         SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
@@ -589,7 +589,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
-                                    SFX_CALLMODE_ASYNCHRON, &aDocItem, &aLibNameItem, 0L );
+                                    SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, 0L );
         EndTabDialog( 1 );
         return 0;
     }
@@ -1320,7 +1320,7 @@ void LibPage::DeleteCurrent()
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute( SID_BASICIDE_LIBREMOVED,
-                                  SFX_CALLMODE_SYNCHRON, &aDocItem, &aLibNameItem, 0L );
+                                  SfxCallMode::SYNCHRON, &aDocItem, &aLibNameItem, 0L );
 
         // remove library from module and dialog library containers
         if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
@@ -1501,7 +1501,7 @@ 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,
-                                          SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                          SfxCallMode::SYNCHRON, &aSbxItem, 0L );
 
                 if( pBasicBox )
                 {
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 9269d47739fb..f1381b7ff79c 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -133,7 +133,7 @@ bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewT
     {
         SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, rNewText, ConvertType( eType ) );
         pDispatcher->Execute( SID_BASICIDE_SBXRENAMED,
-                                SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                SfxCallMode::SYNCHRON, &aSbxItem, 0L );
     }
 
     // OV-Bug?!
@@ -366,7 +366,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
             {
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rSourceDoc, aSourceLibName, aSourceName, ConvertType( eType ) );
                 pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
-                                      SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                      SfxCallMode::SYNCHRON, &aSbxItem, 0L );
             }
         }
 
@@ -458,7 +458,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
         {
             SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDestDoc, aDestLibName, aSourceName, ConvertType( eType ) );
             pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                                  SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                  SfxCallMode::SYNCHRON, &aSbxItem, 0L );
         }
     }
 
@@ -684,7 +684,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
     if (pButton == m_pEditButton)
     {
         SfxAllItemSet aArgs( SfxGetpApp()->GetPool() );
-        SfxRequest aRequest( SID_BASICIDE_APPEAR, SFX_CALLMODE_SYNCHRON, aArgs );
+        SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
         SfxGetpApp()->ExecuteSlot( aRequest );
 
         SfxDispatcher* pDispatcher = GetDispatcher();
@@ -704,7 +704,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
                 }
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), aDesc.GetLibName(),
                                   aModName, m_pBasicBox->ConvertType( aDesc.GetType() ) );
-                pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON, &aSbxItem, 0L );
             }
         }
         else    // Nur Lib selektiert
@@ -723,7 +723,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
             SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
             if ( pDispatcher )
             {
-                pDispatcher->Execute( SID_BASICIDE_LIBSELECTED, SFX_CALLMODE_ASYNCHRON, &aDocItem, &aLibNameItem, 0L );
+                pDispatcher->Execute( SID_BASICIDE_LIBSELECTED, SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, 0L );
             }
         }
         EndTabDialog( 1 );
@@ -831,7 +831,7 @@ void ObjectPage::NewDialog()
                 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aDlgName, TYPE_DIALOG );
                 if (SfxDispatcher* pDispatcher = GetDispatcher())
                     pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
-                                            SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                            SfxCallMode::SYNCHRON, &aSbxItem, 0L );
                 LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
                 SvTreeListEntry* pRootEntry = m_pBasicBox->FindRootEntry( aDocument, eLocation );
                 if ( pRootEntry )
@@ -886,7 +886,7 @@ void ObjectPage::DeleteCurrent()
         {
             SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDocument, aLibName, aName, m_pBasicBox->ConvertType( eType ) );
             pDispatcher->Execute( SID_BASICIDE_SBXDELETED,
-                                  SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                  SfxCallMode::SYNCHRON, &aSbxItem, 0L );
         }
 
         try
@@ -974,7 +974,7 @@ 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,
-                                      SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
+                                      SfxCallMode::SYNCHRON, &aSbxItem, 0L );
             LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
             SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
             if ( pRootEntry )
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 2b331ce72e32..721c1372326b 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -131,7 +131,7 @@ void TbxControls::Select( sal_uInt16 nModifier )
     SfxDispatcher* pDispatcher = pCurFrame ? pCurFrame->GetDispatcher() : NULL;
     if( pDispatcher )
     {
-        pDispatcher->Execute( SID_CHOOSE_CONTROLS, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
+        pDispatcher->Execute( SID_CHOOSE_CONTROLS, SfxCallMode::SYNCHRON, &aItem, 0L );
     }
 }