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>

50 files changed, 115 insertions, 115 deletions

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index ae9e84c299b4..150ed87e8ddf 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -908,7 +908,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget )
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     if (pViewFrm)
         pViewFrm->GetDispatcher()->Execute( SID_OPENDOC,
-                                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                     &aUrl, &aTarget,
                                     &aFrm, &aReferer,
                                     &aNewView, &aBrowsing,
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6393ed3e65b6..eea595e428d7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -370,7 +370,7 @@ void ScInputWindow::Select()
                 if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) )
                 {
                     pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION,
-                                              SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                                              SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
 
                     // The Toolbox will be disabled anyways, so we don't need to switch here,
                     // regardless whether it succeeded or not!
@@ -2365,7 +2365,7 @@ void ScPosWnd::DoEnter()
                 SfxViewFrame* pViewFrm = SfxViewFrame::Current();
                 if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) )
                     pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION,
-                                              SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                                              SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
             }
             else
             {
@@ -2434,7 +2434,7 @@ void ScPosWnd::DoEnter()
                     SfxBoolItem aUnmarkItem( FN_PARAM_1, true );        // remove existing selection
 
                     pViewSh->GetViewData().GetDispatcher().Execute( SID_CURRENTCELL,
-                                        SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                                        SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                                         &aPosItem, &aUnmarkItem, 0L );
                 }
             }
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index ce1db4df3411..52ec40026dee 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -491,7 +491,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre
 
         // Execute the "new style" slot, complete with undo and all necessary updates.
         // The return value (SfxUInt16Item) is ignored, look for new styles instead.
-        pDisp->Execute( SID_STYLE_NEW, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
+        pDisp->Execute( SID_STYLE_NEW, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
                 &aFamilyItem,
                 &aRefItem,
                 0L );
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index ec241f3ad917..1d572b8b1505 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -469,7 +469,7 @@ bool ScPivotLayoutDialog::ApplyChanges()
     mpViewData->GetViewShell()->SetDialogDPObject(&maPivotTableObject);
 
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
-    SfxCallMode nCallMode = SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD;
+    SfxCallMode nCallMode = SfxCallMode::SLOT | SfxCallMode::RECORD;
     const SfxPoolItem* pResult = pDispatcher->Execute(SID_PIVOT_TABLE, nCallMode, &aPivotItem, NULL, 0);
 
     if (pResult != NULL)
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index bf401cee91a5..45b95629b48c 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
             SetDispatcherLock( false );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( SID_CONSOLIDATE,
-                                      SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                      SfxCallMode::SLOT | SfxCallMode::RECORD,
                                       &aOutItem, 0L, 0L );
             Close();
         }
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 463e5a532ba7..6951e3bbc377 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -693,7 +693,7 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
             SetDispatcherLock( false );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( FID_FILTER_OK,
-                                      SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                      SfxCallMode::SLOT | SfxCallMode::RECORD,
                                       GetOutputItem(), 0L, 0L );
             Close();
         }
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 1815e03b496c..4ca889b99426 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -359,7 +359,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
             SetDispatcherLock( false );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( FID_FILTER_OK,
-                                      SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                      SfxCallMode::SLOT | SfxCallMode::RECORD,
                                       GetOutputItem( theOutParam, theFilterArea ), 0L, 0L );
             Close();
         }
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index f317734af97e..fcc55f3166eb 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -79,7 +79,7 @@ bool SearchResultsDlg::Close()
         SfxBoolItem aItem(SID_SEARCH_RESULTS_DIALOG, false);
         if (pDispacher)
             pDispacher->Execute(
-                SID_SEARCH_RESULTS_DIALOG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L);
+                SID_SEARCH_RESULTS_DIALOG, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L);
     }
 
     return ModelessDialog::Close();
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 8027dc8577ff..a8f7883c51cc 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1086,7 +1086,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.sheet.SpreadsheetDocument"));
             SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
             GetViewData()->GetDispatcher().Execute(
-                SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L);
+                SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aApp, &aTarget, 0L);
         }
         break;
         default:
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 5a82ec95bc23..315f55719a8a 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -337,7 +337,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
             pView->ScEndTextEdit(); // end text edit before switching direction
             ExecuteGlobal( rReq );
             // restore consistent state between shells and functions:
-            pViewData->GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            pViewData->GetDispatcher().Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
             break;
 
         case SID_THES:
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 5a2fd1f62419..84fdcacaf0cb 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -237,7 +237,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
                     sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
 
                     pViewShell->GetViewData().GetDispatcher().
-                        Execute(nTextSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                        Execute(nTextSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD);
 
                     // jetzt den erzeugten FuText holen und in den EditModus setzen
                     FuPoor* pPoor = pViewShell->GetViewData().GetView()->GetDrawFuncPtr();
@@ -289,9 +289,9 @@ bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
 
             SfxDispatcher& rDisp = pViewShell->GetViewData().GetDispatcher();
             if ( pView->AreObjectsMarked() )
-                rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rDisp.Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
             else
-                rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rDisp.Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
         }
     }
 
@@ -323,7 +323,7 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
             else                            // Zeichenmodus beenden
             {
                 pViewShell->GetViewData().GetDispatcher().
-                    Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                    Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
             }
             break;
 
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 23ba487d8342..eb2ab21ccaae 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -200,7 +200,7 @@ static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const
         if ( !pPoor || pPoor->GetSlotID() != nTextSlotId )
         {
             pViewShell->GetViewData().GetDispatcher().
-                Execute(nTextSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+                Execute(nTextSlotId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
         }
 
         // get the resulting FuText and set in edit mode
@@ -227,13 +227,13 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
             if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
             {
                 // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
-                rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
                 bReturn = true;
             }
             else if ( pViewShell->IsDrawSelMode() )
             {
                 pView->UnmarkAll();
-                rViewData.GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rViewData.GetDispatcher().Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
                 bReturn = true;
             }
             else if ( pView->AreObjectsMarked() )
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 35feb3fd0b50..c00b28486ff3 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -545,7 +545,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                         sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
 
                         pViewShell->GetViewData().GetDispatcher().
-                            Execute(nTextSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+                            Execute(nTextSlotId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
 
                         // jetzt den erzeugten FuText holen und in den EditModus setzen
                         FuPoor* pPoor = pViewShell->GetViewData().GetView()->GetDrawFuncPtr();
@@ -581,7 +581,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
     if ( !bReturn && rMEvt.IsLeft() )
         if (pViewShell->IsDrawSelMode())
             pViewShell->GetViewData().GetDispatcher().
-                Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
 
     if ( bCopy && pViewData && pDocument && pPage )
     {
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index cb33a3260966..bfb3003257c6 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -309,7 +309,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 //  stattdessen Textmodus verlassen
 
                 pViewShell->GetViewData().GetDispatcher().
-                    Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                    Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
             }
             else
             {
@@ -332,7 +332,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 {
                     pView->UnmarkAllObj();
                     ScViewData& rViewData = pViewShell->GetViewData();
-                    rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                    rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
                     pView->MarkObj(pObj,pPV,false,false);
 
                     pHdl=pView->PickHandle(aMDPos);
@@ -356,7 +356,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
     {
             pView->UnmarkAll();
             ScViewData& rViewData = pViewShell->GetViewData();
-            rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
     }
 
 //  return (bReturn);
@@ -512,9 +512,9 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
 
                 SfxDispatcher& rDisp = pViewShell->GetViewData().GetDispatcher();
                 if ( pView->AreObjectsMarked() )
-                    rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                    rDisp.Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
                 else
-                    rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                    rDisp.Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
             }
         }
     }
@@ -532,9 +532,9 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
 
             SfxDispatcher& rDisp = pViewShell->GetViewData().GetDispatcher();
             if ( pView->AreObjectsMarked() )
-                rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rDisp.Execute(SID_OBJECT_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD);
             else
-                rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                rDisp.Execute(aSfxRequest.GetSlot(), SfxCallMode::SLOT | SfxCallMode::RECORD);
         }
     }
 
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 9c03ed77920a..32ea15d2c449 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -629,7 +629,7 @@ bool ScFunctionDockWin::Close()
     SfxBoolItem aItem( FID_FUNCTION_BOX, false );
 
     GetBindings().GetDispatcher()->Execute( FID_FUNCTION_BOX,
-                                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aItem, 0L );
 
     SfxDockingWindow::Close();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index ea837d460543..2a294fb2448c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -526,7 +526,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked)
     clear();
 
     GetBindings().GetDispatcher()->Execute( SID_INS_FUNCTION,
-                              SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                              SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                               &aRetItem, &aStrItem, &aMatItem, 0L );
 }
 void ScFormulaDlg::setDispatcherLock( bool bLock )
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index f4bdae6b51bd..10ffbfa0ca9b 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -221,7 +221,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
 
                         SwitchToDocument();
                         GetBindings().GetDispatcher()->Execute( SID_SOLVE,
-                                                  SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                                  SfxCallMode::SLOT | SfxCallMode::RECORD,
                                                   &aOutItem, 0L, 0L );
                         Close();
                     }
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 44d545510111..cbfeca17bce7 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -294,7 +294,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
             SetDispatcherLock( false );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( SID_TABOP,
-                                      SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                      SfxCallMode::SLOT | SfxCallMode::RECORD,
                                       &aOutItem, 0L, 0L );
             Close();
         }
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 1f5c137ea6f8..f6e01c42464d 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -926,7 +926,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
         SfxBoolItem     aUnmarkItem( FN_PARAM_1, bUnmark );     // ggf. Selektion aufheben
 
         rBindings.GetDispatcher()->Execute( SID_CURRENTCELL,
-                                  SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                                  SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                                   &aPosItem, &aUnmarkItem, 0L );
     }
 }
@@ -937,7 +937,7 @@ void ScNavigatorDlg::SetCurrentCellStr( const OUString& rName )
     SfxStringItem   aNameItem( SID_CURRENTCELL, rName );
 
     rBindings.GetDispatcher()->Execute( SID_CURRENTCELL,
-                              SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                              SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                               &aNameItem, 0L );
 }
 
@@ -948,7 +948,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo )
         //  Tabelle fuer Basic ist 1-basiert
         SfxUInt16Item aTabItem( SID_CURRENTTAB, static_cast<sal_uInt16>(nTabNo) + 1 );
         rBindings.GetDispatcher()->Execute( SID_CURRENTTAB,
-                                  SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                                  SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                                   &aTabItem, 0L );
     }
 }
@@ -976,7 +976,7 @@ void ScNavigatorDlg::SetCurrentObject( const OUString& rName )
 {
     SfxStringItem aNameItem( SID_CURRENTOBJECT, rName );
     rBindings.GetDispatcher()->Execute( SID_CURRENTOBJECT,
-                              SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                              SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                               &aNameItem, 0L );
 }
 
@@ -984,7 +984,7 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName )        // aktivie
 {
     SfxStringItem aDocItem( SID_CURRENTDOC, rDocName );
     rBindings.GetDispatcher()->Execute( SID_CURRENTDOC,
-                              SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+                              SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
                               &aDocItem, 0L );
 }
 
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 0466e870c892..eaf20ba1f7eb 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -169,7 +169,7 @@ void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId )
     if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() )
     {
         SfxStringItem aStringItem( nSlotId, GetSelectEntry() );
-        pViewFrm->GetDispatcher()->Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aStringItem, 0L, 0L );
+        pViewFrm->GetDispatcher()->Execute( nSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD, &aStringItem, 0L, 0L );
     }
 }
 
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 61a6ad69a0b3..234ea334c912 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -484,7 +484,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
                 SetDispatcherLock( false );
                 SwitchToDocument();
                 GetBindings().GetDispatcher()->Execute( SID_CHANGE_PRINTAREA,
-                                          SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                                          SfxCallMode::SLOT | SfxCallMode::RECORD,
                                           &aPrintArea, &aRepeatRow, &aRepeatCol, &aEntireSheet, 0L );
             }
 
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 3e59aea864ca..4e5ade154797 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -126,7 +126,7 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
     SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp);
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_ALIGN_DEGREES, SFX_CALLMODE_RECORD, &aAngleItem, 0L );
+        SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
     return 0;
 }
 
@@ -136,7 +136,7 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG )
     SfxInt32Item aAngleItem( SID_ATTR_ALIGN_DEGREES,(sal_uInt32) nTmp);
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_ALIGN_DEGREES, SFX_CALLMODE_RECORD, &aAngleItem, 0L );
+        SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L );
 
     return 0;
 }
@@ -146,7 +146,7 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG )
     bool bVertical = mpCbStacked->IsChecked();
     SfxBoolItem  aStackItem( SID_ATTR_ALIGN_STACKED, bVertical );
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_ALIGN_STACKED, SFX_CALLMODE_RECORD, &aStackItem, 0L );
+        SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L );
     return 0;
 }
 
@@ -156,7 +156,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG)
     sal_uInt16 nVal = (sal_uInt16)mpMFLeftIndent->GetValue();
     SfxUInt16Item aItem( SID_ATTR_ALIGN_INDENT,  (sal_uInt16)CalcToUnit( nVal,  SFX_MAPUNIT_TWIP ) );
 
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_INDENT, SFX_CALLMODE_RECORD, &aItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_INDENT, SfxCallMode::RECORD, &aItem, 0L);
     return( 0L );
 }
 
@@ -166,11 +166,11 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG)
 
     //Modified
     //SfxBoolItem aItem( FID_MERGE_TOGGLE , bState);
-    //GetBindings()->GetDispatcher()->Execute(FID_MERGE_TOGGLE, SFX_CALLMODE_RECORD, &aItem, false, 0L);
+    //GetBindings()->GetDispatcher()->Execute(FID_MERGE_TOGGLE, SfxCallMode::RECORD, &aItem, false, 0L);
     if(bState)
-        GetBindings()->GetDispatcher()->Execute(FID_MERGE_ON, SFX_CALLMODE_RECORD);
+        GetBindings()->GetDispatcher()->Execute(FID_MERGE_ON, SfxCallMode::RECORD);
     else
-        GetBindings()->GetDispatcher()->Execute(FID_MERGE_OFF, SFX_CALLMODE_RECORD);
+        GetBindings()->GetDispatcher()->Execute(FID_MERGE_OFF, SfxCallMode::RECORD);
     GetBindings()->Invalidate(FID_MERGE_TOGGLE,true,false);
     //modified end
 
@@ -181,7 +181,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG)
 {
     bool bState = mpCBXWrapText->IsChecked();
     SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState);
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LINEBREAK, SFX_CALLMODE_RECORD, &aItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LINEBREAK, SfxCallMode::RECORD, &aItem, 0L);
     return 0;
 }
 
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 8d2ade9ab010..9907448945af 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -86,7 +86,7 @@ void CellAppearancePropertyPanel::SetFillColor(
     const Color aColor)
 {
     const SvxColorItem aColorItem(aColor, SID_BACKGROUND_COLOR);
-    mpBindings->GetDispatcher()->Execute(SID_BACKGROUND_COLOR, SFX_CALLMODE_RECORD, &aColorItem, 0L);
+    mpBindings->GetDispatcher()->Execute(SID_BACKGROUND_COLOR, SfxCallMode::RECORD, &aColorItem, 0L);
     maBackColor = aColor;
 }
 
@@ -108,7 +108,7 @@ void CellAppearancePropertyPanel::SetLineColor(
     const Color aColor)
 {
     const SvxColorItem aColorItem(aColor, SID_FRAME_LINECOLOR);
-    mpBindings->GetDispatcher()->Execute(SID_FRAME_LINECOLOR, SFX_CALLMODE_RECORD, &aColorItem, 0L);
+    mpBindings->GetDispatcher()->Execute(SID_FRAME_LINECOLOR, SfxCallMode::RECORD, &aColorItem, 0L);
     maLineColor = aColor;
 }
 
@@ -334,7 +334,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG)
 {
     bool bState = mpCBXShowGrid->IsChecked();
     SfxBoolItem aItem( FID_TAB_TOGGLE_GRID , bState);
-    GetBindings()->GetDispatcher()->Execute(FID_TAB_TOGGLE_GRID, SFX_CALLMODE_RECORD, &aItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(FID_TAB_TOGGLE_GRID, SfxCallMode::RECORD, &aItem, 0L);
     return 0;
 }
 
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 31b10db7dad2..bd528f73e22b 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -154,8 +154,8 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
         SvxLineItem     aLineItem2( SID_ATTR_BORDER_DIAG_TLBR );
         aLineItem1.SetLine( NULL );     //modify
         aLineItem2.SetLine( NULL );     //modify
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_BLTR, SFX_CALLMODE_RECORD, &aLineItem1, 0L);
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_TLBR, SFX_CALLMODE_RECORD, &aLineItem2, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_BLTR, SfxCallMode::RECORD, &aLineItem1, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_TLBR, SfxCallMode::RECORD, &aLineItem2, 0L);
         }
         break;
     case TBI_BORDER1_ALL:
@@ -189,7 +189,7 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
     aBorderInner.SetValid( VALID_DISTANCE, true );
     aBorderInner.SetValid( VALID_DISABLE, false );
 
-    mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SFX_CALLMODE_RECORD, &aBorderOuter, &aBorderInner, 0L);
+    mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
     mrCellAppearancePropertyPanel.EndCellBorderStylePopupMode();
     return 0;
 }
@@ -258,21 +258,21 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox)
         aBorderInner.SetValid( VALID_DISTANCE, true );
         aBorderInner.SetValid( VALID_DISABLE, false );
 
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SFX_CALLMODE_RECORD, &aBorderOuter, &aBorderInner, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
     }
     else if(nId == TBI_BORDER2_BLTR)
     {
         editeng::SvxBorderLine aTmp( NULL, 1 );
         SvxLineItem     aLineItem( SID_ATTR_BORDER_DIAG_BLTR );
         aLineItem.SetLine( &aTmp );
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_BLTR, SFX_CALLMODE_RECORD, &aLineItem, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_BLTR, SfxCallMode::RECORD, &aLineItem, 0L);
     }
     else if(nId == TBI_BORDER2_TLBR)
     {
         editeng::SvxBorderLine aTmp( NULL, 1 );
         SvxLineItem     aLineItem( SID_ATTR_BORDER_DIAG_TLBR );
         aLineItem.SetLine( &aTmp );
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_TLBR, SFX_CALLMODE_RECORD, &aLineItem, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER_DIAG_TLBR, SfxCallMode::RECORD, &aLineItem, 0L);
     }
 
     mrCellAppearancePropertyPanel.EndCellBorderStylePopupMode();
@@ -330,7 +330,7 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox)
     aBorderInner.SetValid( VALID_DISTANCE, true );
     aBorderInner.SetValid( VALID_DISABLE, false );
 
-    mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SFX_CALLMODE_RECORD, &aBorderOuter, &aBorderInner, 0L);
+    mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_ATTR_BORDER, SfxCallMode::RECORD, &aBorderOuter, &aBorderInner, 0L);
 
     pTop.reset();
     pBottom.reset();
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index fcb00dfd1510..514b45556e65 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -168,7 +168,7 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
         editeng::SvxBorderLine aTmp;
         aTmp.GuessLinesWidths(nStyle, n1, n2, n3);
         aLineItem.SetLine( &aTmp );
-        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_FRAME_LINESTYLE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
+        mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_FRAME_LINESTYLE, SfxCallMode::RECORD, &aLineItem, 0L);
         SetAllNoSel();
         mrCellAppearancePropertyPanel.EndCellLineStylePopupMode();
     }
@@ -182,7 +182,7 @@ IMPL_LINK(CellLineStyleControl, PBClickHdl, PushButton *, pPBtn)
     {
         if(mrCellAppearancePropertyPanel.GetBindings())
         {
-            mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_CELL_FORMAT_BORDER, SFX_CALLMODE_ASYNCHRON);
+            mrCellAppearancePropertyPanel.GetBindings()->GetDispatcher()->Execute(SID_CELL_FORMAT_BORDER, SfxCallMode::ASYNCHRON);
         }
 
         mrCellAppearancePropertyPanel.EndCellLineStylePopupMode();
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index f19d78e3a503..6efa8f3d2b4c 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -115,7 +115,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatHdl, ToolBox*, pBox )
     if( nId != mnCategorySelected )
     {
         SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT,  nId );
-        GetBindings()->GetDispatcher()->Execute(SID_NUMBER_TYPE_FORMAT, SFX_CALLMODE_RECORD, &aItem, 0L);
+        GetBindings()->GetDispatcher()->Execute(SID_NUMBER_TYPE_FORMAT, SfxCallMode::RECORD, &aItem, 0L);
     }
     return 0L;
 }
@@ -126,7 +126,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox )
     if( nVal != mnCategorySelected )
     {
         SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT,  nVal );
-        GetBindings()->GetDispatcher()->Execute(SID_NUMBER_TYPE_FORMAT, SFX_CALLMODE_RECORD, &aItem, 0L);
+        GetBindings()->GetDispatcher()->Execute(SID_NUMBER_TYPE_FORMAT, SfxCallMode::RECORD, &aItem, 0L);
         mnCategorySelected = nVal;
     }
     return 0L;
@@ -162,7 +162,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG )
     aFormat += sBreak;
 
     SfxStringItem aItem( SID_NUMBER_FORMAT,  aFormat );
-    GetBindings()->GetDispatcher()->Execute(SID_NUMBER_FORMAT, SFX_CALLMODE_RECORD, &aItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_NUMBER_FORMAT, SfxCallMode::RECORD, &aItem, 0L);
     return 0L;
 }
 
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 826876b14b33..d120a7cad022 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -161,7 +161,7 @@ void ScUndoInsertTab::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
         ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData().GetDispatcher().
-            Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD);
 }
 
 bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -256,7 +256,7 @@ void ScUndoInsertTables::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
         ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData().GetDispatcher().
-            Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD);
 }
 
 bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1025,7 +1025,7 @@ void ScUndoImportTab::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
         ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData().GetDispatcher().
-            Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD);
 }
 
 bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1160,7 +1160,7 @@ void ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget)
     if (rTarget.ISA(ScTabViewTarget))
         ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData().GetDispatcher().
             Execute( bShow ? FID_TABLE_SHOW : FID_TABLE_HIDE,
-                                SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+                                SfxCallMode::SLOT | SfxCallMode::RECORD);
 }
 
 bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1566,7 +1566,7 @@ void ScUndoLayoutRTL::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
         ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData().GetDispatcher().
-            Execute( FID_TAB_RTL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+            Execute( FID_TAB_RTL, SfxCallMode::SLOT | SfxCallMode::RECORD);
 }
 
 bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 04c4f08c45ae..dfd80686a17b 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -737,7 +737,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
                 //  Slot der Zeichenfunktion nochmal ausfuehren -> abschalten
                 SfxDispatcher* pDisp = pViewSh->GetDispatcher();
                 if (pDisp)
-                    pDisp->Execute( pFunc->GetSlotID(), SFX_CALLMODE_SYNCHRON );
+                    pDisp->Execute( pFunc->GetSlotID(), SfxCallMode::SYNCHRON );
             }
             pViewSh->SetDrawShell(false);
             pViewSh->SetDrawSelMode(false); // nach dem Dispatcher-Execute
@@ -1740,7 +1740,7 @@ void ScTabViewObj::SelectionChanged()
     // direct here
     ScFormatShell aShell( &GetViewShell()->GetViewData() );
     SfxAllItemSet reqList( SfxGetpApp()->GetPool() );
-    SfxRequest aReq( SID_STYLE_END_PREVIEW, 0, reqList );
+    SfxRequest aReq( SID_STYLE_END_PREVIEW, SfxCallMode::SLOT, reqList );
     aShell.ExecuteStyle( aReq );
     lang::EventObject aEvent;
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 0b632d787aac..685292338ea5 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1259,7 +1259,7 @@ ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar )
     {
         SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE, _displayformulabar);
         SfxAllItemSet reqList(  SfxGetpApp()->GetPool() );
-        SfxRequest aReq( FID_TOGGLEINPUTLINE, 0, reqList );
+        SfxRequest aReq( FID_TOGGLEINPUTLINE, SfxCallMode::SLOT, reqList );
         pViewShell->Execute( aReq );
     }
 }
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 4976326d87db..dffde94c6985 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -435,13 +435,13 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
                 if ( !pViewFrame->GetFrame().IsInPlace() )
                 {
                     SC_MOD()->InputEnterHandler();
-                    pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
+                    pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SfxCallMode::SYNCHRON );
                     while ( isInPrintPreview( pViewFrame ) )
                         Application::Yield();
                 }
             }
             else
-                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SfxCallMode::SYNCHRON, aArgs );
         }
 
     }
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 2d0a52b8d133..04b71d2a78f6 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3600,7 +3600,7 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException, std::exc
         }
         if ( pDispatcher )
         {
-            pDispatcher->Execute( nSID, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+            pDispatcher->Execute( nSID, (SfxCallMode)SfxCallMode::SYNCHRON, aArgs );
         }
     }
 
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 09ba55e8c1fb..99353aacc9ef 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -880,7 +880,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
         case SID_STATUS_DOCPOS:
             // Launch navigator.
             GetViewData()->GetDispatcher().Execute(
-                SID_NAVIGATOR, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
+                SID_NAVIGATOR, SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
             break;
 
         case SID_MARKAREA:
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bbf1c38398b7..b4bf4ab1d673 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -252,7 +252,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
     // in case of vertical toolbar
     if ( !rReq.GetArgs() )
     {
-        pViewData->GetDispatcher().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        pViewData->GetDispatcher().Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
         return;
     }
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 219adb2f3977..7fd9bdec0ab5 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -564,7 +564,7 @@ IMPL_LINK_NOARG(ScGridWindow, PopupModeEndHdl)
 IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo )
 {
     if( pInfo->nCommand == SPELLCMD_STARTSPELLDLG )
-        pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SFX_CALLMODE_ASYNCHRON );
+        pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON );
     return 0;
 }
 
@@ -825,7 +825,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
         pDBData->GetArea(aRange);
         pViewData->GetView()->MarkRange(aRange);
         pViewData->GetView()->SetCursor(rPos.Col(), rPos.Row());
-        pViewData->GetDispatcher().Execute(SID_FILTER, SFX_CALLMODE_SLOT|SFX_CALLMODE_RECORD);
+        pViewData->GetDispatcher().Execute(SID_FILTER, SfxCallMode::SLOT|SfxCallMode::RECORD);
         return;
     }
 
@@ -1400,7 +1400,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel,
             pDBData->GetArea( nAreaTab, nStartCol,nStartRow,nEndCol,nEndRow );
             pViewData->GetView()->MarkRange( ScRange( nStartCol,nStartRow,nAreaTab,nEndCol,nEndRow,nAreaTab));
             pViewData->GetView()->SetCursor(nCol,nRow);     //! auch ueber Slot ??
-            pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            pViewData->GetDispatcher().Execute( SID_FILTER, SfxCallMode::SLOT | SfxCallMode::RECORD );
         }
         else
         {
@@ -1725,7 +1725,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
 
             SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX );
             SfxInt32Item aPosYItem( SID_RANGE_ROW, nPosY );
-            pViewData->GetDispatcher().Execute( SID_FILL_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+            pViewData->GetDispatcher().Execute( SID_FILL_SELECT, SfxCallMode::SLOT | SfxCallMode::RECORD,
                                         &aPosXItem, &aPosYItem, (void*)0L );
 
         }
@@ -2107,7 +2107,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             }
         }
         else
-            pViewData->GetDispatcher().Execute( FID_FILL_AUTO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            pViewData->GetDispatcher().Execute( FID_FILL_AUTO, SfxCallMode::SLOT | SfxCallMode::RECORD );
     }
     else if (pViewData->GetFillMode() == SC_FILL_MATRIX)
     {
@@ -2226,7 +2226,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
                 if ( pView->HasSelectionForDrillDown( nDummy ) )
                 {
                     // execute slot to show dialog
-                    pViewData->GetDispatcher().Execute( SID_OUTLINE_SHOW, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+                    pViewData->GetDispatcher().Execute( SID_OUTLINE_SHOW, SfxCallMode::SLOT | SfxCallMode::RECORD );
                 }
                 else
                 {
@@ -2411,7 +2411,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             // cell cursor isn't visible after making selection, it would jump
             // back to the origin of the selection where the cell cursor is.
             SfxBoolItem aAlignCursorItem( FN_PARAM_2, false );
-            pDisp->Execute( SID_CURRENTCELL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+            pDisp->Execute( SID_CURRENTCELL, SfxCallMode::SLOT | SfxCallMode::RECORD,
                                         &aPosItem, &aAlignCursorItem, (void*)0L );
 
             pViewData->GetView()->InvalidateAttribs();
@@ -4064,7 +4064,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 SfxStringItem aNameItem( SID_CHART_NAME, aChartName );
                 SfxStringItem aRangeItem( SID_CHART_SOURCE, aRangeName );
                 sal_uInt16 nId = bIsMove ? SID_CHART_SOURCE : SID_CHART_ADDSOURCE;
-                pViewData->GetDispatcher().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                pViewData->GetDispatcher().Execute( nId, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                             &aRangeItem, &aNameItem, (void*) NULL );
                 bDone = true;
             }
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index e7b50e8993ee..ab843eec4a89 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -666,7 +666,7 @@ void ScPreview::KeyInput( const KeyEvent& rKEvt )
         if(nSlot)
         {
             bHandled = true;
-            pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON );
+            pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSlot, SfxCallMode::ASYNCHRON );
         }
     }
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 798ac3a10aa6..be99e685bc82 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -1162,7 +1162,7 @@ void ScPreviewShell::DoScroll( sal_uInt16 nMode )
 
 void ScPreviewShell::ExitPreview()
 {
-    GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SFX_CALLMODE_ASYNCHRON);
+    GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SfxCallMode::ASYNCHRON);
 }
 
 void ScPreviewShell::AddAccessibilityObject( SfxListener& rObject )
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 43da32180ebb..b3f75e402cb3 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -88,7 +88,7 @@ void ScSpellDialogChildWindow::InvalidateSpellDialog()
 
         // finished? - close the spelling dialog
         if( mxEngine->IsFinished() )
-            GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, SFX_CALLMODE_ASYNCHRON );
+            GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON );
     }
     return aPortions;
 }
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index ce52883e9ae1..68757a292ee5 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -211,7 +211,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
     if ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && nMouseClickPageId != 0 && nMouseClickPageId != TAB_PAGE_NOTFOUND )
     {
         SfxDispatcher* pDispatcher = pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
-        pDispatcher->Execute( FID_TAB_MENU_RENAME, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+        pDispatcher->Execute( FID_TAB_MENU_RENAME, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
         return;
     }
 
@@ -222,7 +222,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
         // otherwise add new sheet
         sal_uInt16 nSlot = ( GetSelectPageCount() > 1 ) ? FID_TAB_DESELECTALL : FID_INS_TABLE;
         SfxDispatcher* pDispatcher = pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
-        pDispatcher->Execute( nSlot, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+        pDispatcher->Execute( nSlot, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
         // forget page ID, to be really sure that the dialog is not called twice
         nMouseClickPageId = TabBar::PAGE_NOT_FOUND;
     }
@@ -279,7 +279,7 @@ void ScTabControl::Select()
     {
         //  Tabelle fuer Basic ist 1-basiert
         SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 );
-        rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+        rDisp.Execute( SID_CURRENTTAB, SfxCallMode::SLOT | SfxCallMode::RECORD,
                                 &aItem, (void*) NULL );
     }
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index e5acb09e0b92..65f6d072323f 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -215,7 +215,7 @@ void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )
                 pGridWin[i]->Update();      // wegen Invalidate im DrawView ctor (ShowPage),
                                             // damit gleich gezeichnet werden kann
             }
-        SfxRequest aSfxRequest(SID_OBJECT_SELECT, 0,aViewData.GetViewShell()->GetPool());
+        SfxRequest aSfxRequest(SID_OBJECT_SELECT, SfxCallMode::SLOT, aViewData.GetViewShell()->GetPool());
         SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView,
                                         pLayer,aSfxRequest));
 
@@ -341,7 +341,7 @@ void ScTabView::DrawDeselectAll()
         {
             // end text edit (as if escape pressed, in FuDraw)
             aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(),
-                                        SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+                                        SfxCallMode::SLOT | SfxCallMode::RECORD );
         }
 
         pDrawView->ScEndTextEdit();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 571532633499..ded17ef4177e 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -487,7 +487,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     // #102785#; finish input
                     pScMod->InputEnterHandler();
 
-                    pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_ASYNCHRON );
+                    pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SfxCallMode::ASYNCHRON );
                 }
                 //  else Fehler (z.B. Ole)
             }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index b3c558d9ece0..ee241c451ae3 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -300,7 +300,7 @@ bool ScTabViewShell::PrepareClose(bool bUI)
     {
         // "clean" end of text edit, including note handling, subshells and draw func switching,
         // as in FuDraw and ScTabView::DrawDeselectAll
-        GetViewData().GetDispatcher().Execute( pPoor->GetSlotID(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+        GetViewData().GetDispatcher().Execute( pPoor->GetSlotID(), SfxCallMode::SLOT | SfxCallMode::RECORD );
     }
     ScDrawView* pDrView = GetScDrawView();
     if ( pDrView )
@@ -1330,10 +1330,10 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                         {
                             if( bShift )
                                 GetViewData().GetDispatcher().Execute( SID_CURSORENTERUP,
-                                            SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+                                            SfxCallMode::SLOT | SfxCallMode::RECORD );
                             else
                                 GetViewData().GetDispatcher().Execute( SID_CURSORENTERDOWN,
-                                            SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+                                            SfxCallMode::SLOT | SfxCallMode::RECORD );
                         }
                         else
                             UpdateInputHandler(true);
@@ -1384,7 +1384,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         }
         if ( nSlotId )
         {
-            GetViewData().GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            GetViewData().GetDispatcher().Execute( nSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD );
             bUsed = true;
         }
     }
@@ -1428,7 +1428,7 @@ bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         {
             sal_uInt16 nMode = GetLockedModifiers();
             LockModifiers(KEY_MOD1);
-            GetViewData().GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            GetViewData().GetDispatcher().Execute( nSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD );
             LockModifiers(nMode);
             bUsed = true;
         }
@@ -1644,7 +1644,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
                 if(SC_MOD()->GetCurRefDlgId()==0)
                 {
                         pFirst->GetDispatcher()->Execute( SID_UPDATETABLINKS,
-                                            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                 }
             }
 
@@ -1670,7 +1670,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
                 if(SC_MOD()->GetCurRefDlgId()==0)
                 {
                     pFirst->GetDispatcher()->Execute( SID_REIMPORT_AFTER_LOAD,
-                                            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                 }
             }
         }
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index e2c77bd65011..20b42c41fd61 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -112,7 +112,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                     bReadOnly = GetViewData().GetSfxDocShell()->IsReadOnly();
 
                     SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadOnly);
-                    GetViewData().GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON,
+                    GetViewData().GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::ASYNCHRON,
                                                 &aItem, 0L );
 
                     UpdateInputContext();
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index c0e51fb57e6f..6cfbc9656b86 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -83,7 +83,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
         //  for sounds (linked or not), insert a hyperlink button,
         //  like in Impress and Writer
         const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() );
-        GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
+        GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L );
     }
 }
 
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index e010c86f07ac..5b422dfb15c5 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -268,7 +268,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
     //  Rahmen fuer Chart einfuegen wird abgebrochen:
     FuPoor* pPoor = GetDrawFuncPtr();
     if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART )
-        GetViewData().GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+        GetViewData().GetDispatcher().Execute(SID_DRAW_CHART, SfxCallMode::SLOT | SfxCallMode::RECORD);
 
     MakeDrawLayer();
 
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 30fe1927d504..9e27f03fd1f9 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -299,8 +299,8 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
 
                     aSearchItem.SetWhich(SID_SEARCH_ITEM);
                     GetViewData().GetDispatcher().Execute( FID_SEARCH_NOW,
-                            rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
-                                            SFX_CALLMODE_STANDARD,
+                            rReq.IsAPI() ? SfxCallMode::API|SfxCallMode::SYNCHRON :
+                                            SfxCallMode::RECORD,
                             &aSearchItem, 0L );
                     const SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow(
                             SvxSearchDialogWrapper::GetChildWindowId());
@@ -325,7 +325,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                 else
                 {
                     GetViewData().GetDispatcher().Execute(
-                            SID_SEARCH_DLG, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD );
+                            SID_SEARCH_DLG, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD );
                 }
             }
             break;
@@ -336,8 +336,8 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                 SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
                 aSearchItem.SetWhich(SID_SEARCH_ITEM);
                 GetViewData().GetDispatcher().Execute( FID_SEARCH_NOW,
-                        rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
-                                        SFX_CALLMODE_STANDARD,
+                        rReq.IsAPI() ? SfxCallMode::API|SfxCallMode::SYNCHRON :
+                                        SfxCallMode::RECORD,
                         &aSearchItem, 0L );
             }
             break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 4a69e92182b0..bd0fb122e88a 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2343,14 +2343,14 @@ void ScViewFunc::MoveTable(
     {
         nDestTab = 0;           // firstly insert
 
-        //  execute without SFX_CALLMODE_RECORD, because already contained in move command
+        //  execute without SfxCallMode::RECORD, because already contained in move command
 
         OUString aUrl("private:factory/" STRING_SCAPP);
         SfxStringItem aItem( SID_FILE_NAME, aUrl );
         SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") );
 
         const SfxPoolItem* pRetItem = GetViewData().GetDispatcher().Execute(
-                    SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, &aTarget, 0L );
+                    SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aItem, &aTarget, 0L );
         if ( pRetItem )
         {
             if ( pRetItem->ISA( SfxObjectItem ) )
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 8ddef3c7316a..452bfa9b85b9 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -578,7 +578,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink
     {
         const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aStrURL );
         return ( 0 != GetViewData().GetDispatcher().Execute(
-                                SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON,
+                                SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON,
                                 &aMediaURLItem, 0L ) );
     }
 
@@ -607,7 +607,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink
             // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren
             // und das bekommt dem MAC nicht so gut ...
             return ( 0 != rDispatcher.Execute( SID_OPENDOC,
-                                    SFX_CALLMODE_ASYNCHRON, &aFileNameItem, &aFilterItem, &aTargetItem, 0L) );
+                                    SfxCallMode::ASYNCHRON, &aFileNameItem, &aFilterItem, &aTargetItem, 0L) );
         }
     }
 
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 25859d371412..27ff0f4cc561 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -406,7 +406,7 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
 
             //  asynchronous, to avoid doing the whole import in drop handler
             SfxDispatcher& rDisp = GetViewData().GetDispatcher();
-            rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON,
+            rDisp.Execute(SID_SBA_IMPORT, SfxCallMode::ASYNCHRON,
                                         &aDataDesc, &aTarget, &aAreaNew, (void*)0 );
 
             bRet = true;
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index d88650a594e5..6842fbc4048d 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -112,7 +112,7 @@ static void lcl_jumpToRange(const ScRange& rRange, ScViewData* pView, ScDocument
     SfxStringItem aPosItem(SID_CURRENTCELL, aAddrText);
     SfxBoolItem aUnmarkItem(FN_PARAM_1, true);        // remove existing selection
     pView->GetDispatcher().Execute(
-        SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
+        SID_CURRENTCELL, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
         &aPosItem, &aUnmarkItem, 0L);
 }
 
@@ -501,7 +501,7 @@ void ScViewFunc::EditNote()
                 static_cast< FuSelection* >( pDraw )->ActivateNoteHandles( pCaption );
 
             // activate object (as in FuSelection::TestComment)
-            GetViewData().GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+            GetViewData().GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
             // now get the created FuText and set into EditMode
             FuPoor* pPoor = GetDrawFuncPtr();
             if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) )    // has no RTTI
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index aee424157ce0..8b245fb39bca 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -383,7 +383,7 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet )
     if( IsFullScreen( rViewShell ) != bSet )
     {
         SfxBoolItem aItem( SID_WIN_FULLSCREEN, bSet );
-        rViewShell.GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SFX_CALLMODE_RECORD, &aItem, 0L );
+        rViewShell.GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SfxCallMode::RECORD, &aItem, 0L );
     }
 }