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>
author: Noel Grandin <noel@peralex.com> 2014-10-11 16:01:26 +0200
committer: Noel Grandin <noelgrandin@gmail.com> 2014-10-11 15:14:52 +0000
commit: 8044acf2db9d125d5ed58ed25df5df4a90f37ac6 (patch)
tree: 67af1fff3f9bc0d144b80d5ecbe5a078cd08dbd3
parent: cb7ede2d9970a4d162dc71922f578922c0d6235a (diff)
254 files changed, 717 insertions, 690 deletions
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 1883aadbd9cd..d9f4302e8a10 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -140,7 +140,7 @@ void MediaFloater::dispatchCurrentURL()
             url = mpMediaWindow->getURL();
         }
         const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, url );
-        pDispatcher->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_RECORD, &aMediaURLItem, 0L );
+        pDispatcher->Execute( SID_INSERT_AVMEDIA, SfxCallMode::RECORD, &aMediaURLItem, 0L );
     }
 }
 
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 );
     }
 }
 
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a6440fce4afc..a8a87d28f96e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -739,7 +739,7 @@ bool SpellDialog::Close()
 {
     GetBindings().GetDispatcher()->
         Execute(rParent.GetType(),
-        SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+        SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
     return true;
 }
 
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 7224ed36c8da..c355fe0f5cfa 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -173,8 +173,8 @@ SvxHpLinkDlg::~SvxHpLinkDlg ()
 bool SvxHpLinkDlg::Close()
 {
     GetDispatcher()->Execute( SID_HYPERLINK_DIALOG,
-                              SFX_CALLMODE_ASYNCHRON |
-                              SFX_CALLMODE_RECORD);
+                              SfxCallMode::ASYNCHRON |
+                              SfxCallMode::RECORD);
     return true;
 }
 
@@ -194,8 +194,8 @@ void SvxHpLinkDlg::Apply()
                                   aItemSet.GetItem (SID_HYPERLINK_SETLINK);
         OUString aStrEmpty;
         if ( aItem->GetURL() != aStrEmpty )
-            GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON |
-                                      SFX_CALLMODE_RECORD, aItem, 0L);
+            GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SfxCallMode::ASYNCHRON |
+                                      SfxCallMode::RECORD, aItem, 0L);
 
         ( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )->DoApply();
     }
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 97ea77ddd274..e03e94032103 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -344,7 +344,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
                     // open url
                     const SfxPoolItem* pReturn = GetDispatcher()->Execute( SID_OPENDOC,
-                                                                           SFX_CALLMODE_SYNCHRON,
+                                                                           SfxCallMode::SYNCHRON,
                                                                            &aName, &aFlags,
                                                                            &aFrame, &aReferer, 0L );
 
@@ -358,7 +358,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
                             SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
                             pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC,
-                                                                  SFX_CALLMODE_SYNCHRON,
+                                                                  SfxCallMode::SYNCHRON,
                                                                   &aNewName, 0L );
 
                         }
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 433d06f08978..8f51b8fab196 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -401,7 +401,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
     SfxBoolItem aBrowse( SID_BROWSE, true );
 
     const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL };
-    (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+    (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 
     return( 0L );
 }
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 00f8c97131d4..8540db472097 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -284,7 +284,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
     if( pViewFrame )
     {
         SfxItemPool &rPool = pViewFrame->GetPool();
-        SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, 0, rPool);
+        SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, SfxCallMode::SLOT, rPool);
         pViewFrame->ExecuteSlot( aReq, true );
     }
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 88900347d401..52fa7ed7388a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1342,7 +1342,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                 if ( pViewFrame )
                 {
                     SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
-                    pDispatch->Execute( SID_ATTR_YEAR2000, SFX_CALLMODE_ASYNCHRON, pItem, 0L);
+                    pDispatch->Execute( SID_ATTR_YEAR2000, SfxCallMode::ASYNCHRON, pItem, 0L);
                 }
                 aMisc.SetYear2000(nY2K);
             }
@@ -1422,17 +1422,17 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         pItem = 0;
         if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
         {
-            pDispatch->Execute(pItem->Which(),    SFX_CALLMODE_ASYNCHRON, pItem, 0L);
+            pDispatch->Execute(pItem->Which(),    SfxCallMode::ASYNCHRON, pItem, 0L);
             bSaveSpellCheck = true;
         }
         if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem ))
         {
-            pDispatch->Execute(pItem->Which(),    SFX_CALLMODE_ASYNCHRON, pItem, 0L);
+            pDispatch->Execute(pItem->Which(),    SfxCallMode::ASYNCHRON, pItem, 0L);
             bSaveSpellCheck = true;
         }
         if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem ))
         {
-            pDispatch->Execute(pItem->Which(),    SFX_CALLMODE_ASYNCHRON, pItem, 0L);
+            pDispatch->Execute(pItem->Which(),    SfxCallMode::ASYNCHRON, pItem, 0L);
             bSaveSpellCheck = true;
         }
 
@@ -1440,7 +1440,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         {
             bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue();
             pDispatch->Execute(SID_AUTOSPELL_CHECK,
-                SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, pItem, 0L);
+                SfxCallMode::ASYNCHRON|SfxCallMode::RECORD, pItem, 0L);
 
             xProp->setIsSpellAuto( bOnlineSpelling );
         }
@@ -1449,7 +1449,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         {
             //! the config item has changed since we modified the
             //! property set it uses
-            pDispatch->Execute(SID_SPELLCHECKER_CHANGED, SFX_CALLMODE_ASYNCHRON);
+            pDispatch->Execute(SID_SPELLCHECKER_CHANGED, SfxCallMode::ASYNCHRON);
         }
     }
 
@@ -1458,7 +1458,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         SfxViewFrame* _pViewFrame = SfxViewFrame::GetFirst();
         while ( _pViewFrame )
         {
-            _pViewFrame->GetDispatcher()->Execute(pItem->Which(),    SFX_CALLMODE_ASYNCHRON, pItem, 0L);
+            _pViewFrame->GetDispatcher()->Execute(pItem->Which(),    SfxCallMode::ASYNCHRON, pItem, 0L);
             _pViewFrame = SfxViewFrame::GetNext( *_pViewFrame );
         }
     }
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 2fc15158a11a..58e8a1c87d20 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1126,7 +1126,7 @@ void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
     if ( pViewFrame != NULL && pViewFrame->GetDispatcher() )
         pPtr = (const OfaRefItem<XColorList> *)pViewFrame->
             GetDispatcher()->Execute( SID_GET_COLORLIST,
-                                      SFX_CALLMODE_SYNCHRON );
+                                      SfxCallMode::SYNCHRON );
     pColorList = pPtr ? pPtr->GetValue() : XColorList::GetStdColorList();
 
     SetPageType( &pShadow->nUnknownType );
@@ -1152,7 +1152,7 @@ void SvxColorTabPage::SaveToViewFrame( SfxViewFrame *pViewFrame )
         return;
 
     const OfaRefItem<XColorList> * pPtr;
-    pPtr = (const OfaRefItem<XColorList>*)pViewFrame->GetDispatcher()->Execute( SID_GET_COLORLIST, SFX_CALLMODE_SYNCHRON );
+    pPtr = (const OfaRefItem<XColorList>*)pViewFrame->GetDispatcher()->Execute( SID_GET_COLORLIST, SfxCallMode::SYNCHRON );
     if( pPtr )
     {
         XColorListRef pReference = pPtr->GetValue();
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 0bccd70bb78b..2fbe66d23369 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -56,15 +56,39 @@ class SfxUnoControllerItem;
 
 typedef std::vector<SfxUnoControllerItem*> SfxUnoControllerArr_Impl;
 
-#define SFX_CALLMODE_SLOT               0x00    // sync/async from Slot
-#define SFX_CALLMODE_SYNCHRON           0x01    // synchronously in the same Stackframe
-#define SFX_CALLMODE_ASYNCHRON          0x02    // asynchronously via AppEvent
-#define SFX_CALLMODE_RECORD             0x04    // take into account while recording
-#define SFX_CALLMODE_API                0x08    // API call (silent)
-#define SFX_CALLMODE_MODAL              0x10    // despite ModalMode
+enum class SfxCallMode : sal_uInt16
+{
+    SLOT      = 0x00,    // sync/async from Slot
+    SYNCHRON  = 0x01,    // synchronously in the same Stackframe
+    ASYNCHRON = 0x02,    // asynchronously via AppEvent
+    RECORD    = 0x04,    // take into account while recording
+    API       = 0x08,    // API call (silent)
+    MODAL     = 0x10     // despite ModalMode
+};
+// make combining these type-safe
+inline SfxCallMode operator| (SfxCallMode lhs, SfxCallMode rhs)
+{
+    return static_cast<SfxCallMode>(static_cast<sal_uInt16>(lhs) | static_cast<sal_uInt16>(rhs));
+}
+inline SfxCallMode operator& (SfxCallMode lhs, SfxCallMode rhs)
+{
+    return static_cast<SfxCallMode>(static_cast<sal_uInt16>(lhs) & static_cast<sal_uInt16>(rhs));
+}
+inline SfxCallMode operator~ (SfxCallMode rhs)
+{
+    return static_cast<SfxCallMode>(0x1f & ~(static_cast<sal_uInt16>(rhs)));
+}
+inline SfxCallMode& operator|= (SfxCallMode& lhs, SfxCallMode rhs)
+{
+    lhs = static_cast<SfxCallMode>(static_cast<sal_uInt16>(lhs) | static_cast<sal_uInt16>(rhs));
+    return lhs;
+}
+inline SfxCallMode& operator&= (SfxCallMode& lhs, SfxCallMode rhs)
+{
+    lhs = static_cast<SfxCallMode>(static_cast<sal_uInt16>(lhs) & static_cast<sal_uInt16>(rhs));
+    return lhs;
+}
 
-#define SFX_CALLMODE_STANDARD       SFX_CALLMODE_RECORD
-typedef sal_uInt16 SfxCallMode;
 
 enum SfxPopupAction
 {
@@ -177,7 +201,7 @@ public:
     bool             Execute( sal_uInt16 nSlot,
                                  const SfxPoolItem **pArgs = 0,
                                  sal_uInt16 nModi = 0,
-                                 SfxCallMode nCall = SFX_CALLMODE_SLOT,
+                                 SfxCallMode nCall = SfxCallMode::SLOT,
                                  const SfxPoolItem **pInternalArgs = 0);
 
     SAL_DLLPRIVATE void SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rFrame );
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index eac691e0ad05..3b1476c3a0e2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -101,7 +101,7 @@ friend class SfxHelp;
                                     SfxItemSet &rState, const SfxSlot *pRealSlot );
     void                _Execute( SfxShell &rShell, const SfxSlot &rSlot,
                                   SfxRequest &rReq,
-                                  SfxCallMode eCall = SFX_CALLMODE_STANDARD);
+                                  SfxCallMode eCall = SfxCallMode::RECORD);
 
 protected:
     void FlushImpl();
@@ -115,7 +115,7 @@ public:
     virtual             ~SfxDispatcher();
 
     const SfxPoolItem*  Execute( sal_uInt16 nSlot,
-                                 SfxCallMode nCall = SFX_CALLMODE_SLOT,
+                                 SfxCallMode nCall = SfxCallMode::SLOT,
                                  const SfxPoolItem **pArgs = 0,
                                  sal_uInt16 nModi = 0,
                                  const SfxPoolItem **pInternalArgs = 0);
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index a47f96292624..f862cb0f279a 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -37,6 +37,7 @@ class SfxShell;
 class SfxSlot;
 class SfxViewFrame;
 struct SfxRequest_Impl;
+enum class SfxCallMode : sal_uInt16;
 
 
 
@@ -44,7 +45,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint
 {
 friend struct SfxRequest_Impl;
 
-    sal_uInt16              nSlot;
+    sal_uInt16          nSlot;
     SfxAllItemSet*      pArgs;
     SfxRequest_Impl*    pImp;
 
@@ -60,10 +61,10 @@ private:
 
 public:
                         SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId );
-                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool );
+                        SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool );
                         SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs,
-                                            sal_uInt16 nCallMode, SfxItemPool &rPool );
-                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs );
+                                            SfxCallMode nCallMode, SfxItemPool &rPool );
+                        SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs );
                         SfxRequest( const SfxRequest& rOrig );
                         virtual ~SfxRequest();
 
@@ -89,7 +90,7 @@ public:
 
     static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
     static bool         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
-    sal_uInt16          GetCallMode() const;
+    SfxCallMode         GetCallMode() const;
     void                AllowRecording( bool );
     bool                AllowsRecording() const;
     bool                IsAPI() const;
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index a5d119b3ac78..0d272005787f 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -73,7 +73,7 @@ namespace ooo
 
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const OUString& aUrl );
      VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps );
-        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SfxCallMode::SYNCHRON );
         VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
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 );
     }
 }
 
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 5daa653a5d58..1c8a296b7511 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -995,7 +995,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
     else if (nCommand == SPELLCMD_STARTSPELLDLG)
     {
         SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SPELL_DIALOG,
-            SFX_CALLMODE_ASYNCHRON );
+            SfxCallMode::ASYNCHRON );
     }
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 96465a4ff93a..51fda0c8cb93 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1834,7 +1834,7 @@ void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTarge
             aTargets.insert( aTargets.end(), rTargets.begin(), rTargets.end() );
             Sequence< Any > aTargetSequence( comphelper::containerToSequence( aTargets ) );
             const SfxUnoAnyItem aItem( SID_ADD_MOTION_PATH, Any( aTargetSequence ) );
-            pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON, &aItem, 0 );
+            pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSID, SfxCallMode::ASYNCHRON, &aItem, 0 );
         }
     }
 }
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index a93091e8c56c..0899fffcaa8f 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -465,7 +465,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl )
     {
         if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) )
         {
-            mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_EDIT, SFX_CALLMODE_ASYNCHRON);
+            mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_EDIT, SfxCallMode::ASYNCHRON);
             return true;
         }
         else if( rMEvt.IsLeft() )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index e853d6fda758..9c1a84b93592 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1004,19 +1004,19 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
     case SID_REPLYTO_POSTIT:
     {
         const SfxUnoAnyItem aItem( SID_REPLYTO_POSTIT, Any( xAnnotation ) );
-        pDispatcher->Execute( SID_REPLYTO_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 );
+        pDispatcher->Execute( SID_REPLYTO_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 );
         break;
     }
     case SID_DELETE_POSTIT:
     {
         const SfxUnoAnyItem aItem( SID_DELETE_POSTIT, Any( xAnnotation ) );
-        pDispatcher->Execute( SID_DELETE_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 );
+        pDispatcher->Execute( SID_DELETE_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 );
         break;
     }
     case SID_DELETEALLBYAUTHOR_POSTIT:
     {
         const SfxStringItem aItem( SID_DELETEALLBYAUTHOR_POSTIT, sAuthor );
-        pDispatcher->Execute( SID_DELETEALLBYAUTHOR_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 );
+        pDispatcher->Execute( SID_DELETEALLBYAUTHOR_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 );
         break;
     }
     case SID_DELETEALL_POSTIT:
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 77a34765c753..1af99370d306 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -458,7 +458,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume
         return;
 
     pViewFrame->GetDispatcher()->Execute(SID_SUMMARY_PAGE,
-        SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+        SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
 
     OSL_ASSERT (pDocument!=NULL);
 
@@ -601,7 +601,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                         }
                         else
                         {
-                            SfxRequest aRequest (SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool());
+                            SfxRequest aRequest (SID_OPENDOC, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool());
                             aRequest.AppendItem (aFile);
                             aRequest.AppendItem (aReferer);
                             // Put the password into the request
@@ -685,7 +685,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                                 SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty);
                                 SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE );
                                 pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE,
-                                   SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L);
+                                   SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aIsChangedItem, &eAutoLayout, 0L);
                             }
 
                             // clear document info
@@ -895,7 +895,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF
 
     if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher())
     {
-        pViewFrame->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+        pViewFrame->GetDispatcher()->Execute(SID_SIZE_PAGE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
     }
 }
 
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 30f0b8b1eeb0..c494cdce10a2 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -120,7 +120,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
             {
                 SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PK_STANDARD);
                 SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME, pMaster->GetName() );
-                pViewFrame->GetDispatcher()->Execute(SID_PRESENTATION_LAYOUT,SFX_CALLMODE_SLOT, &aStyle, 0L );
+                pViewFrame->GetDispatcher()->Execute(SID_PRESENTATION_LAYOUT,SfxCallMode::SLOT, &aStyle, 0L );
                 pViewFrame->GetBindings().Invalidate(SID_PRESENTATION_LAYOUT);
                 pViewFrame->GetBindings().Invalidate(SID_STATUS_LAYOUT);
             }
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index b0e27296ce9f..98df417636ce 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -62,7 +62,7 @@ LayerTabBar::~LayerTabBar()
 void LayerTabBar::Select()
 {
     SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-    pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON);
+    pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::ASYNCHRON);
 }
 
 void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
@@ -77,7 +77,7 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
         if (aLayerId == 0)
         {
             SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-            pDispatcher->Execute(SID_INSERTLAYER, SFX_CALLMODE_SYNCHRON);
+            pDispatcher->Execute(SID_INSERTLAYER, SfxCallMode::SYNCHRON);
 
             bSetPageID=true;
         }
@@ -103,7 +103,7 @@ void LayerTabBar::DoubleClick()
     if (GetCurPageId() != 0)
     {
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-        pDispatcher->Execute( SID_MODIFYLAYER, SFX_CALLMODE_SYNCHRON );
+        pDispatcher->Execute( SID_MODIFYLAYER, SfxCallMode::SYNCHRON );
     }
 }
 
@@ -283,7 +283,7 @@ void LayerTabBar::ActivatePage()
     {
 
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-        pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON);
+        pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::ASYNCHRON);
     }
 }
 
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 3dd4c0188ef0..480a5f74e0e7 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -39,7 +39,7 @@ void RequestNavigatorUpdate (SfxBindings* pBindings)
         SfxBoolItem aItem (SID_NAVIGATOR_INIT, true);
         pBindings->GetDispatcher()->Execute(
             SID_NAVIGATOR_INIT,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
             &aItem,
             0L);
     }
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index c535d04f6c60..daf0aaaa4541 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -85,7 +85,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void)
         SfxBoolItem aItem (SID_SPELL_DIALOG, false);
         GetBindings().GetDispatcher()->Execute(
             SID_SPELL_DIALOG,
-            SFX_CALLMODE_ASYNCHRON,
+            SfxCallMode::ASYNCHRON,
             &aItem,
             0L);
     }
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 2e9764b49efa..f8db33ebe451 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -397,7 +397,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
     SfxBoolItem aItem( SID_ANIMATOR_ADD, true );
 
     GetBindings().GetDispatcher()->Execute(
-        SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
+        SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
     return( 0L );
 }
 
@@ -482,7 +482,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, true );
 
     GetBindings().GetDispatcher()->Execute(
-        SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
+        SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
     return( 0L );
 }
 
@@ -776,7 +776,7 @@ bool AnimationWindow::Close()
         SfxBoolItem aItem( SID_ANIMATION_OBJECTS, false );
 
         GetBindings().GetDispatcher()->Execute(
-            SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+            SID_ANIMATION_OBJECTS, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
         SfxDockingWindow::Close();
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index b5c6d0852183..08eb6f324d3c 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1468,7 +1468,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview )
         }
         else
         {
-            SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
+            SfxRequest aReq( SID_OPENDOC, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() );
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
             aReq.AppendItem( SfxStringItem( SID_REFERER, OUString() ) );
             aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 34d3c48c8a92..b9aa3f5ea1a3 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl)
             {
                 SfxBoolItem aItem( nSId, true );
                 mpBindings->GetDispatcher()->Execute(
-                    nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L );
+                    nSId, SfxCallMode::SLOT |SfxCallMode::RECORD, &aItem, 0L );
             }
         }
         break;
@@ -292,7 +292,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl)
             {
                 SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage );
                 mpBindings->GetDispatcher()->Execute(
-                    SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
+                    SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
             }
         }
         break;
@@ -396,7 +396,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
             {
                 SfxStringItem aItem( SID_NAVIGATOR_OBJECT, aStr );
                 mpBindings->GetDispatcher()->Execute(
-                    SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
+                    SID_NAVIGATOR_OBJECT, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
                 //set sign variable
                 maTlbObjects.MarkCurEntry(aStr);
 
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 7ad69b81e96d..628b66f303af 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -910,7 +910,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark)
                 GetFrameView()->SetPageKind(eNewPageKind);
                 ( ( mpViewShell && mpViewShell->GetViewFrame() ) ?
                   mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
-                  GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                  GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
 
                 // The current ViewShell changed
                 pDrViewSh = (DrawViewShell*) mpViewShell;
@@ -1014,7 +1014,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
                 GetFrameView()->SetPageKind(eNewPageKind);
                 ( ( mpViewShell && mpViewShell->GetViewFrame() ) ?
                   mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->
-                  GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                  GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
 
                 // The current ViewShell changed
                 pDrViewSh = (DrawViewShell*) mpViewShell;
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 0b9e31c4cb69..a46ec7c0a2e9 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -199,7 +199,7 @@ DrawDocShell::~DrawDocShell()
 
     if( pFrame )
         pFrame->GetDispatcher()->Execute(
-            SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L);
+            SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L);
 }
 
 void DrawDocShell::GetState(SfxItemSet &rSet)
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 681096330b45..d8685cb78764 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -353,7 +353,7 @@ bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
     bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn;
 
     if (!bPermanent)
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
     return bReturn;
 }
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 7f57ddf53224..312e32f5b0bf 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -156,7 +156,7 @@ bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
     bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn;
 
     if (!bPermanent && bCreated)
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
     return bReturn;
 }
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index bf74e9c2414b..8b1ebdcf5a10 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -210,7 +210,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
 
     if ((!bPermanent && bCreated) || bDeleted)
     {
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
     }
 
     return(bReturn);
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index eeaf6485ce1f..a17388a067a1 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -159,7 +159,7 @@ bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
     bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn;
 
     if (!bPermanent)
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
     return bReturn;
 }
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 3ed1773d8790..ec44ea456fae 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -262,7 +262,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
     bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn;
 
     if (!bPermanent)
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
     return bReturn;
 }
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 50e5c9bee598..a6842ba07f13 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -178,7 +178,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
                 mpView->MarkObj(aPnt, nHitLog);
             }
 
-            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
         }
         else if (rMEvt.IsLeft() && !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() &&
                  !bSelectionChanged                   &&
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 65a09c5824f9..ae6ee9706997 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -113,7 +113,7 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
     bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
 
     if (!bPermanent)
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
     return (bReturn);
 }
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index e9e3e5a9bf32..e8eaec958789 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -74,7 +74,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
             mpViewShell->SetStartShowWithDialog();
 
             mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
-                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
         }
     }
 }
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 53e64fd9ff12..219cd6e52fc6 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -430,7 +430,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
                 // Switch to FuSelect.
                 mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
                     SID_OBJECT_SELECT,
-                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
                 // changeover to the next object
                 if(!mpView->MarkNextObj( !aCode.IsShift() ))
@@ -765,7 +765,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
             {
                 mpViewShell->GetViewFrame()->
                     GetDispatcher()->Execute( SID_INSERT_GRAPHIC,
-                                              SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                              SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
             }
             else if ( ( pObj->ISA(SdrTextObj) || pObj->ISA(SdrObjGroup) ) &&
                       !SD_MOD()->GetWaterCan()                            &&
@@ -774,8 +774,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
             {
                 SfxUInt16Item aItem(SID_TEXTEDIT, 2);
                 mpViewShell->GetViewFrame()->GetDispatcher()->
-                                 Execute(SID_TEXTEDIT, SFX_CALLMODE_ASYNCHRON |
-                                         SFX_CALLMODE_RECORD, &aItem, 0L);
+                                 Execute(SID_TEXTEDIT, SfxCallMode::ASYNCHRON |
+                                         SfxCallMode::RECORD, &aItem, 0L);
             }
             else if (nInv == SdrInventor &&  nSdrObjKind == OBJ_GRUP)
             {
@@ -786,7 +786,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
         }
     }
     else
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 }
 
 bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
@@ -1025,7 +1025,7 @@ bool FuDraw::cancel()
         // Switch to FuSelect.
         mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
             SID_OBJECT_SELECT,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
         bReturn = true;
     }
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 6df9b36fcb41..dc349d837c6a 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -254,7 +254,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
 
         delete pOutl;
 
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_DELETE_PAGE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_DELETE_PAGE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
     }
 }
 
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index dcf5ad77ecd5..2eaa074da246 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -81,7 +81,7 @@ void FuFormatPaintBrush::implcancel()
     {
         SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame();
         pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
-        pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
     }
 }
 
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 0e2512f3a68e..1040ab1e7b2c 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -154,14 +154,14 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
                 if ( rMEvt.IsMod1() )
                 {
                     // open in new frame
-                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aStrItem, &aBrowseItem, &aReferer, 0L);
                 }
                 else
                 {
                     // open in current frame
                     SfxFrameItem aFrameItem( SID_DOCFRAME, pFrame );
-                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
                 }
             }
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 53f901639a85..66f6484607cf 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -237,13 +237,13 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
                         mpView->MarkObj(pCandidate, mpView->GetSdrPageView());
 
                         mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
-                            SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON);
+                            SID_ATTR_CHAR, SfxCallMode::ASYNCHRON);
                     }
                     else
                     {
                         // insert a new page with the same page layout
                         mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
-                            SID_INSERTPAGE_QUICK, SFX_CALLMODE_ASYNCHRON);
+                            SID_INSERTPAGE_QUICK, SfxCallMode::ASYNCHRON);
                     }
 
                     // consumed
@@ -267,11 +267,11 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
                     }
                     else if( pObj && pObj->IsEmptyPresObj() && pObj->ISA( SdrGrafObj ) )
                     {
-                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_GRAPHIC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_GRAPHIC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                     }
                     else
                     {
-                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                     }
 
                     // consumed
@@ -352,7 +352,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
             {
                 // zoom to page
                 mpViewShell->GetViewFrame()->GetDispatcher()->
-                Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                 bReturn = true;
             }
         }
@@ -364,7 +364,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
             {
                 // zoom to selected objects
                 mpViewShell->GetViewFrame()->GetDispatcher()->
-                Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                Execute(SID_SIZE_OPTIMAL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                 bReturn = true;
             }
         }
@@ -823,7 +823,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
 
                         mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
                             SID_ATTR_CHAR,
-                            SFX_CALLMODE_ASYNCHRON,
+                            SfxCallMode::ASYNCHRON,
                             &aInputString,
                             0L);
 
@@ -874,7 +874,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
 
                         mpViewShell->GetViewFrame()->GetDispatcher()->Execute(
                             SID_ATTR_CHAR,
-                            SFX_CALLMODE_ASYNCHRON,
+                            SfxCallMode::ASYNCHRON,
                             &aInputString,
                             0L);
 
@@ -1124,7 +1124,7 @@ bool FuPoor::cancel()
 {
     if ( !this->ISA(FuSelection) )
     {
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
         return true;
     }
 
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 283916836247..11f1237cb07e 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -229,7 +229,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
                 }
 
                 // force update of TabBar
-                mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_MASTERPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_MASTERPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
             }
             else
             {
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 05ae58801ad4..8b3269c3e34e 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -160,17 +160,17 @@ void FuScale::DoExecute( SfxRequest& rReq )
                     {
                         // name confusion: SID_SIZE_ALL -> zoom onto all objects
                         // --> the program offers it as optimal
-                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                        mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                     }
                 }
                 break;
 
                 case SVX_ZOOM_PAGEWIDTH:
-                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                     break;
 
                 case SVX_ZOOM_WHOLEPAGE:
-                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                     break;
                 default:
                     break;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 0b0c1d41eb47..51d134e60364 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -251,8 +251,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 
                     SfxUInt16Item aItem(SID_TEXTEDIT, 1);
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON |
-                            SFX_CALLMODE_RECORD, &aItem, 0L);
+                    Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON |
+                            SfxCallMode::RECORD, &aItem, 0L);
                     return bReturn; // CAUTION, due to the synchronous slot the object is deleted now
                 }
             }
@@ -269,14 +269,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 if (rMEvt.IsMod1())
                 {
                     // Open in new frame
-                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aStrItem, &aBrowseItem, &aReferer, 0L);
                 }
                 else
                 {
                     // Open in current frame
                     SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
-                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                    pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
                 }
 
@@ -754,7 +754,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
             if( rMEvt.IsRight() )
             {
                 // In watering-can mode, on press onto right mouse button, a undo is executed
-                mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_UNDO, SFX_CALLMODE_ASYNCHRON );
+                mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_UNDO, SfxCallMode::ASYNCHRON );
             }
             else if (pWaterCanCandidate != NULL)
             {
@@ -823,7 +823,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
             pHdl = NULL;
             mpWindow->ReleaseMouse();
             FuDraw::MouseButtonUp(rMEvt);
-            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SYNCHRON);
+            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::SYNCHRON);
             return bReturn; // CAUTION, due to the synchronous slot, the object is deleted now.
         }
 
@@ -988,7 +988,7 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt)
         {
             mpView->ResetCreationActive();
 
-            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+            mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
         }
     }
 
@@ -1235,7 +1235,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                 SfxBoolItem aBrowseItem( SID_BROWSE, true );
                 mpWindow->ReleaseMouse();
                 pFrame->GetDispatcher()->
-                    Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                    Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                             &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
 
                 bAnimated = true;
@@ -1259,7 +1259,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                      // Jump to Bookmark (Page or Object)
                     SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark());
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L);
+                    Execute(SID_NAVIGATOR_OBJECT, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L);
                     bAnimated = true;
                 }
                 break;
@@ -1276,7 +1276,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                         SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
                         SfxBoolItem aBrowseItem( SID_BROWSE, true );
                         pFrame->GetDispatcher()->
-                        Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                        Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                 &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
                     }
 
@@ -1289,7 +1289,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                     // Jump to the previous page
                     SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_PREVIOUS);
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                    Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD,
                             &aItem, 0L);
                     bAnimated = true;
                 }
@@ -1300,7 +1300,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                     // Jump to the next page
                     SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_NEXT);
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                    Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD,
                             &aItem, 0L);
                     bAnimated = true;
                 }
@@ -1311,7 +1311,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                     // Jump to the first page
                     SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_FIRST);
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                    Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD,
                             &aItem, 0L);
                     bAnimated = true;
                 }
@@ -1322,7 +1322,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                     // Jump to the last page
                     SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_LAST);
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                    Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+                    Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD,
                             &aItem, 0L);
                     bAnimated = true;
                 }
@@ -1367,7 +1367,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                         SfxViewFrame* pViewFrm = SfxViewFrame::Current();
                         if (pViewFrm)
                             pViewFrm->GetDispatcher()->Execute( SID_OPENDOC,
-                                                          SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                                                          SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                                         &aUrl,
                                                         &aBrowsing,
                                                         0L );
@@ -1469,7 +1469,7 @@ bool FuSelection::cancel()
     if (mpView->Is3DRotationCreationActive())
     {
         mpView->ResetCreationActive();
-        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+        mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
         return true;
     }
     else
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index bdb8fe32bfbe..8d1f439bf4ca 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -268,7 +268,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 
                     // we switch explicitly into selection mode
                     mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT,
-                                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                        SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 
                 }
                 else
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 669cead02abb..d4aa31ac756a 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -342,14 +342,14 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
                         if (rMEvt.IsMod1())
                         {
                             // open in new frame
-                            pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                            pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                         &aStrItem, &aBrowseItem, &aReferer, 0L);
                         }
                         else
                         {
                             // open in current frame
                             SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
-                            pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                            pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                         &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
                         }
                     }
@@ -873,7 +873,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
             }
 
             mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT,
-                                      SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                      SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
         }
     }
     if (bJustEndedEdit)
diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx
index ec65cc044498..7533ce194056 100644
--- a/sd/source/ui/func/undoheaderfooter.cxx
+++ b/sd/source/ui/func/undoheaderfooter.cxx
@@ -42,13 +42,13 @@ SdHeaderFooterUndoAction::~SdHeaderFooterUndoAction()
 void SdHeaderFooterUndoAction::Undo()
 {
     mpPage->setHeaderFooterSettings( maOldSettings );
-    SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+    SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 }
 
 void SdHeaderFooterUndoAction::Redo()
 {
     mpPage->setHeaderFooterSettings( maNewSettings );
-    SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+    SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 4e15c5c56abd..283724b136a4 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -331,7 +331,7 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout)
     {
         pDispatcher->Execute(
             SID_INSERTPAGE,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
             *aRequest.GetArgs());
     }
     UpdateSelection();
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 247e9f55ef1b..9b708235b58d 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -325,7 +325,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
                 if (pDispatcher != NULL)
                 {
                     sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId();
-                    pDispatcher->Execute(SID_MASTERPAGE, SFX_CALLMODE_SYNCHRON);
+                    pDispatcher->Execute(SID_MASTERPAGE, SfxCallMode::SYNCHRON);
                     PreviewValueSet::SelectItem (nIndex);
                     mrBase.GetDrawController().setCurrentPage(xSelectedMaster);
                 }
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 7f72a3c0ce6d..a4757d70d76e 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -138,7 +138,7 @@ void SlideShowRestarter::StartPresentation (void)
     // Start the slide show on the saved current slide.
     if (mpDispatcher != NULL)
     {
-        mpDispatcher->Execute(SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON);
+        mpDispatcher->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON);
         if (mpSlideShow.is())
         {
             Sequence<css::beans::PropertyValue> aProperties (1);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4704c9040da1..1281111ce1cc 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -733,7 +733,7 @@ void SAL_CALL SlideshowImpl::disposing()
         if( mpViewShell->IsStartShowWithDialog() && getDispatcher() )
         {
             mpViewShell->SetStartShowWithDialog( false );
-            getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+            getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
         }
 
         mpViewShell->GetViewShellBase().UpdateBorder(true);
@@ -1568,7 +1568,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
             SfxViewFrame* pViewFrm = SfxViewFrame::Current();
             if (pViewFrm)
                 pViewFrm->GetDispatcher()->Execute( SID_OPENDOC,
-                                              SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                                              SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                                             &aUrl,
                                             &aBrowsing,
                                             0L );
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 9ebfd1e56fa8..0a78e7e84f0c 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -151,7 +151,7 @@ void SlideSorterController::Init (void)
     // Create the selection function.
     SfxRequest aRequest (
         SID_OBJECT_SELECT,
-        0,
+        SfxCallMode::SLOT,
         mrModel.GetDocument()->GetItemPool());
     mrSlideSorter.SetCurrentFunction(CreateSelectionFunction(aRequest));
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 6f66ccd60261..e8577b918a57 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -411,7 +411,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
                 {
                     pViewShell->GetDispatcher()->Execute(
                         SID_INSERTPAGE,
-                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                        SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                 }
                 bResult = true;
             }
@@ -1133,7 +1133,7 @@ bool NormalModeHandler::ProcessButtonDownEvent (
 
             mrSlideSorter.GetViewShell()->GetDispatcher()->Execute(
                 SID_INSERTPAGE,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
             break;
         }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index dba3fa2cf7b7..331210a48e7d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1029,7 +1029,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
         SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
         if (mrSlideSorter.GetViewShell() != NULL)
             mrSlideSorter.GetViewShell()->GetDispatcher()->Execute(
-                SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
     }
 
     return bSuccess;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 4776edf2aa6d..629556dfbb68 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -189,7 +189,7 @@ void TableDesignWidget::ApplyStyle()
         {
             if( pView )
             {
-                SfxRequest aReq( SID_TABLE_STYLE, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
+                SfxRequest aReq( SID_TABLE_STYLE, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() );
                 aReq.AppendItem( SfxStringItem( SID_TABLE_STYLE, sStyleName ) );
 
                 rtl::Reference< sdr::SelectionController > xController( pView->getSelectionController() );
@@ -208,7 +208,7 @@ void TableDesignWidget::ApplyStyle()
         {
             SfxDispatcher* pDispatcher = getDispatcher( mrBase );
             SfxStringItem aArg( SID_TABLE_STYLE, sStyleName );
-            pDispatcher->Execute(SID_INSERT_TABLE, SFX_CALLMODE_ASYNCHRON, &aArg, 0 );
+            pDispatcher->Execute(SID_INSERT_TABLE, SfxCallMode::ASYNCHRON, &aArg, 0 );
         }
     }
     catch( Exception& )
@@ -238,7 +238,7 @@ void TableDesignWidget::ApplyOptions()
 
     if( mxSelectedTable.is() )
     {
-        SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
+        SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() );
 
         for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i )
         {
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 29085e674c23..0c07056be177 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -478,7 +478,7 @@ void SdUnoDrawView::SetZoom( sal_Int16 nZoom )
         SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
         if( pDispatcher )
         {
-            pDispatcher->Execute(SID_ATTR_ZOOM,SFX_CALLMODE_SYNCHRON,&aZoomItem, 0L);
+            pDispatcher->Execute(SID_ATTR_ZOOM,SfxCallMode::SYNCHRON,&aZoomItem, 0L);
         }
     }
 }
@@ -528,7 +528,7 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType )
                     return;
             }
             SvxZoomItem aZoomItem( eZoomType );
-            pDispatcher->Execute(SID_ATTR_ZOOM,SFX_CALLMODE_SYNCHRON,&aZoomItem, 0L);
+            pDispatcher->Execute(SID_ATTR_ZOOM,SfxCallMode::SYNCHRON,&aZoomItem, 0L);
         }
     }
 }
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index ca507c2fe1f9..b62456ea3d8c 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -70,7 +70,7 @@ void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, cons
         aState = frame::DispatchResultState::FAILURE;
     else
     {
-        SfxRequest aReq( pSlot, aArgs, SFX_CALLMODE_SYNCHRON, SD_MOD()->GetPool() );
+        SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SD_MOD()->GetPool() );
         const SfxPoolItem* pResult = SD_MOD()->ExecuteSlot( aReq );
         if ( pResult )
             aState = frame::DispatchResultState::SUCCESS;
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 7a25bcdd88b9..f40af072005f 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -318,7 +318,7 @@ void Outliner::EndSpelling (void)
         // Make FuSelection the current function.
         pViewShell->GetDispatcher()->Execute(
             SID_OBJECT_SELECT,
-            SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+            SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
 
         // Remove and, if previously created by us, delete the outline
         // view.
@@ -1292,8 +1292,8 @@ void Outliner::EnterEditMode (bool bGrabFocus)
         SfxUInt16Item aItem (SID_TEXTEDIT, 1);
         ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
         pViewShell->GetDispatcher()->
-            Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON |
-                SFX_CALLMODE_RECORD, &aItem, 0L);
+            Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON |
+                SfxCallMode::RECORD, &aItem, 0L);
 
         // To be consistent with the usual behaviour in the Office the text
         // object that is put into edit mode would have also to be selected.
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index a5d7527c4c00..63d89849de5a 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -407,7 +407,7 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
                     if( GetViewFrame() )
                     {
                         GetViewFrame()->GetDispatcher()->Execute(
-                            SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON );
+                            SID_PRESENTATION, SfxCallMode::ASYNCHRON );
                     }
                 }
                 break;
@@ -909,7 +909,7 @@ OUString ViewShellBase::GetInitialViewShellType (void)
 void ViewShellBase::StartPresentation()
 {
     if( GetViewFrame() && GetViewFrame()->GetDispatcher() )
-        GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 }
 
 ::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer (void)
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 7fb2f2e05a05..d859637bb0a6 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -209,7 +209,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             }
 
             mrViewShell.GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
             bool bSetModified = true;
 
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index d2508afe311b..59dd054fed19 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1168,7 +1168,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell)
             pView->UnmarkAll();
             pViewShell->GetViewFrame()->GetDispatcher()->Execute(
                 SID_OBJECT_SELECT,
-                SFX_CALLMODE_ASYNCHRON);
+                SfxCallMode::ASYNCHRON);
         }
     }
 
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index e3a606bae0ea..fb0d194f9aad 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -282,7 +282,7 @@ void BezierObjectBar::Execute(SfxRequest& rReq)
             }
 
             if( (pIPPEC == mpView) && !mpView->AreObjectsMarked() )
-                mpViewSh->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                mpViewSh->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
             rReq.Ignore();
         }
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 7f435665ab42..1a01e03e4292 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -122,7 +122,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
             else
             {
                 if( mpViewShell && mpViewShell->GetViewFrame() )
-                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON );
+                    mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON );
             }
 
             rReq.Done();
@@ -572,11 +572,11 @@ void TextObjectBar::Execute( SfxRequest &rReq )
                     // attributes for TextObjectBar
                     case SID_ATTR_CHAR_FONT:
                         mpViewShell->GetViewFrame()->GetDispatcher()->
-                            Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON );
+                            Execute( SID_CHAR_DLG, SfxCallMode::ASYNCHRON );
                     break;
                     case SID_ATTR_CHAR_FONTHEIGHT:
                         mpViewShell->GetViewFrame()->GetDispatcher()->
-                            Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON );
+                            Execute( SID_CHAR_DLG, SfxCallMode::ASYNCHRON );
                     break;
                     case SID_ATTR_CHAR_COLOR:
                     break;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 93814cc08726..8dd8d031990a 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -154,7 +154,7 @@ void DrawViewShell::SelectionHasChanged (void)
     //Update3DWindow(); // 3D-Controller
     SfxBoolItem aItem( SID_3D_STATE, true );
     GetViewFrame()->GetDispatcher()->Execute(
-        SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+        SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
     SdrOle2Obj* pOleObj = NULL;
 
@@ -685,7 +685,7 @@ void DrawViewShell::ResetActualPage()
     }
 
     GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 }
 
 /**
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 4ac1be5ff2e7..f1a9454614ca 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -304,7 +304,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     case SID_ATTR_FILL_BITMAP:
                     case SID_ATTR_FILL_TRANSPARENCE:
                     case SID_ATTR_FILL_FLOATTRANSPARENCE:
-                        GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_AREA, SFX_CALLMODE_ASYNCHRON );
+                        GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_AREA, SfxCallMode::ASYNCHRON );
                         break;
                     case SID_ATTR_LINE_STYLE:
                     case SID_ATTR_LINE_DASH:
@@ -313,10 +313,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     case SID_ATTR_LINE_TRANSPARENCE:
                     case SID_ATTR_LINE_JOINT:
                     case SID_ATTR_LINE_CAP:
-                        GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_LINE, SFX_CALLMODE_ASYNCHRON );
+                        GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_LINE, SfxCallMode::ASYNCHRON );
                         break;
                     case SID_ATTR_TEXT_FITTOSIZE:
-                        GetViewFrame()->GetDispatcher()->Execute( SID_TEXTATTR_DLG, SFX_CALLMODE_ASYNCHRON );
+                        GetViewFrame()->GetDispatcher()->Execute( SID_TEXTATTR_DLG, SfxCallMode::ASYNCHRON );
                         break;
                 }
             }
@@ -357,7 +357,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             SdPage* pNewPage = CreateOrDuplicatePage (rReq, mePageKind, GetActualPage());
             Cancel();
             if(HasCurrentFunction(SID_BEZIER_EDIT) )
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             if (pNewPage != NULL)
                 SwitchPage((pNewPage->GetPageNum()-1)/2);
             rReq.Done ();
@@ -388,7 +388,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             Cancel();
             if(HasCurrentFunction(SID_BEZIER_EDIT))
                 GetViewFrame()->GetDispatcher()->Execute(
-                    SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                    SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             rReq.Done ();
         }
         break;
@@ -618,17 +618,17 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                     case SVX_ZOOM_OPTIMAL:
                         GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL,
-                                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                         break;
 
                     case SVX_ZOOM_PAGEWIDTH:
                         GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH,
-                                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                         break;
 
                     case SVX_ZOOM_WHOLEPAGE:
                         GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE,
-                                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+                                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
                         break;
                     case SVX_ZOOM_PAGEWIDTH_NOBORDER:
                         OSL_FAIL("sd::DrawViewShell::FuTemporary(), SVX_ZOOM_PAGEWIDTH_NOBORDER not handled!" );
@@ -650,7 +650,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsTextEdit() )
             {
                 mpDrawView->SdrEndTextEdit();
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             }
 
             if ( mpDrawView->IsPresObjSelected() )
@@ -686,7 +686,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if( HasCurrentFunction(SID_BEZIER_EDIT) )
             {   // where applicable, activate right edit action
                 GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT,
-                                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                                        SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
             }
             rReq.Ignore ();
             break;
@@ -695,7 +695,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsTextEdit() )
             {
                 mpDrawView->SdrEndTextEdit();
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             }
 
             if ( mpDrawView->IsPresObjSelected() )
@@ -723,7 +723,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             if ( mpDrawView->IsTextEdit() )
             {
                 mpDrawView->SdrEndTextEdit();
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             }
 
             if ( mpDrawView->IsPresObjSelected(true,true,true) )
@@ -1079,7 +1079,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         {
             // The value (sal_uInt16)0xFFFF means set bullet on/off.
             SfxUInt16Item aItem(FN_SVX_SET_BULLET, (sal_uInt16)0xFFFF);
-            GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SFX_CALLMODE_RECORD, &aItem, 0L );
+            GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SfxCallMode::RECORD, &aItem, 0L );
         }
         break;
 
@@ -1087,7 +1087,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         {
             // The value (sal_uInt16)0xFFFF means set bullet on/off.
             SfxUInt16Item aItem(FN_SVX_SET_NUMBER, (sal_uInt16)0xFFFF);
-            GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SFX_CALLMODE_RECORD, &aItem, 0L );
+            GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SfxCallMode::RECORD, &aItem, 0L );
         }
         break;
 
@@ -1539,7 +1539,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             GetDoc()->SetChanged(true);
 
             GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHLAYER,
-                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
             Cancel();
             rReq.Done ();
@@ -1763,7 +1763,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                         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,
@@ -2604,7 +2604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 Cancel();
             }
             else if( rReq.GetSlot() == SID_STYLE_APPLY )
-                GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON );
+                GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON );
             rReq.Ignore ();
         }
         break;
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 414923858bab..7318d84bad9b 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -187,7 +187,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
                 SwitchPage(nSelectedPage);
 
                 if(HasCurrentFunction(SID_BEZIER_EDIT))
-                    GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                    GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 
                 Invalidate();
                 InvalidateWindows();
@@ -1016,13 +1016,13 @@ void  DrawViewShell::ExecStatusBar(SfxRequest& rReq)
     {
         case SID_ATTR_SIZE:
         {
-            GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_TRANSFORM, SFX_CALLMODE_ASYNCHRON );
+            GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_TRANSFORM, SfxCallMode::ASYNCHRON );
         }
         break;
 
         case SID_STATUS_LAYOUT:
         {
-            GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION_LAYOUT, SFX_CALLMODE_ASYNCHRON );
+            GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION_LAYOUT, SfxCallMode::ASYNCHRON );
         }
         break;
     }
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index e92efea8be57..8b7d1a06a59f 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -180,13 +180,13 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
                 GetView()->MarkObj(pCandidate, GetView()->GetSdrPageView());
 
                 GetViewFrame()->GetDispatcher()->Execute(
-                    SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON);
+                    SID_ATTR_CHAR, SfxCallMode::ASYNCHRON);
             }
             else
             {
                 // insert a new page with the same page layout
                 GetViewFrame()->GetDispatcher()->Execute(
-                    SID_INSERTPAGE_QUICK, SFX_CALLMODE_ASYNCHRON);
+                    SID_INSERTPAGE_QUICK, SfxCallMode::ASYNCHRON);
             }
         }
         else
@@ -922,7 +922,7 @@ void DrawViewShell::ShowSnapLineContextMenu (
             const SfxPoolItem* aArguments[] = {&aHelpLineItem, NULL};
             GetViewFrame()->GetDispatcher()->Execute(
                 SID_SET_SNAPITEM,
-                SFX_CALLMODE_SLOT,
+                SfxCallMode::SLOT,
                 aArguments);
         }
         break;
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index e76fae8a5676..9c9a151c08c1 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -74,7 +74,7 @@ void DrawViewShell::ModelHasChanged()
 
     SfxBoolItem aItem( SID_3D_STATE, true );
     GetViewFrame()->GetDispatcher()->Execute(
-        SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+        SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
     // now initialize the TextEditOutliner which was newly created by the draw engine
     ::Outliner* pOutliner     = mpDrawView->GetTextEditOutliner();
@@ -128,7 +128,7 @@ void DrawViewShell::ArrangeGUIElements (void)
     {
         // with split, always resize first window
         //af pWindow = mpContentWindow.get();
-        SfxRequest aReq(SID_SIZE_PAGE, 0, GetDoc()->GetItemPool());
+        SfxRequest aReq(SID_SIZE_PAGE, SfxCallMode::SLOT, GetDoc()->GetItemPool());
         ExecuteSlot( aReq );
     }
 }
@@ -300,7 +300,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
     if ( mpDrawView->IsDesignMode() != pView->IsDesignMode() )
     {
         SfxBoolItem aDesignModeItem( SID_FM_DESIGN_MODE, pView->IsDesignMode() );
-        GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aDesignModeItem, 0L );
+        GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aDesignModeItem, 0L );
     }
 
     // has to be called in the end, because it executes a WriteFrameViewData()
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index f41a51a5faa5..603814a2182a 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -174,7 +174,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
     else if( nType == com::sun::star::gallery::GalleryItemType::MEDIA )
     {
         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 );
     }
 
     GetDocSh()->SetWaitCursor( false );
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 741bfe06a2a3..4f12613fdd7a 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -340,7 +340,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
     }
 
     // start selection function
-    SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
+    SfxRequest aReq(SID_OBJECT_SELECT, SfxCallMode::SLOT, GetDoc()->GetItemPool());
     FuPermanent(aReq);
     mpDrawView->SetFrameDragSingles(true);
 
@@ -566,7 +566,7 @@ void DrawViewShell::SetupPage (Size &rSize,
 
     // zoom onto (new) page size
     GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
-                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                        SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 }
 
 void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
@@ -776,7 +776,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint)
         // Change to selection when turning on read-only mode.
         if(GetDocSh()->IsReadOnly() && dynamic_cast< FuSelection* >( GetCurrentFunction().get() ) )
         {
-            SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
+            SfxRequest aReq(SID_OBJECT_SELECT, SfxCallMode::SLOT, GetDoc()->GetItemPool());
             FuPermanent(aReq);
         }
 
@@ -787,7 +787,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint)
 
             SfxBoolItem aItem( SID_FM_DESIGN_MODE, !mbReadOnly );
             GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
         }
     }
 
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 58f8e602ddba..c3485e76ca9e 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -122,7 +122,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName  )
         // inform navigator about change
         SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
         GetViewFrame()->GetDispatcher()->Execute(
-            SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+            SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
         // Tell the slide sorter about the name change (necessary for
         // accessibility.)
@@ -204,7 +204,7 @@ void DrawViewShell::ModifyLayer (
 
         GetViewFrame()->GetDispatcher()->Execute(
             SID_SWITCHLAYER,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
         // Call Invalidate at the form shell.
         FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell();
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 31c500c72d4f..21357a1c96dd 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -142,7 +142,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
                 SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
                 SfxBoolItem aBrowseItem(SID_BROWSE, true);
                 pFrame->GetDispatcher()->
-                Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                             &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
             }
 
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index f7999e8e0c92..99fd3547f5e0 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -466,7 +466,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
             }
             else
             {
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             }
 
             rReq.Done();
@@ -612,8 +612,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
                         // Make FuText the current function.
                         SfxUInt16Item aItem (SID_TEXTEDIT, 1);
                         GetViewFrame()->GetDispatcher()->
-                            Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON |
-                                SFX_CALLMODE_RECORD, &aItem, 0L);
+                            Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON |
+                                SfxCallMode::RECORD, &aItem, 0L);
                         // Put text object into edit mode.
                         GetView()->SdrBeginTextEdit(static_cast<SdrTextObj*>(pObj), pPageView);
                         break;
@@ -671,7 +671,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             sal_uInt16 nMappedSlot = GetMappedSlot( nSId );
             if( nMappedSlot > 0 )
             {
-                SfxRequest aReq( nMappedSlot, 0, GetDoc()->GetItemPool() );
+                SfxRequest aReq( nMappedSlot, SfxCallMode::SLOT, GetDoc()->GetItemPool() );
                 ExecuteSlot( aReq );
             }
         }
@@ -968,7 +968,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
                 ChangeEditMode(EM_MASTERPAGE, mbIsLayerModeActive);
 
                 if(HasCurrentFunction(SID_BEZIER_EDIT))
-                    GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                    GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
             }
             else
             {
@@ -1028,7 +1028,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
             {
                 GetViewFrame()->GetDispatcher()->Execute(
                     SID_OBJECT_SELECT,
-                    SFX_CALLMODE_ASYNCHRON);
+                    SfxCallMode::ASYNCHRON);
             }
 
             rReq.Done();
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 73ce8d718f09..0394c23515d6 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -140,7 +140,7 @@ void DrawViewShell::AssignFrom3DWindow()
                     sal_uInt16 nSId = SID_CONVERT_TO_3D;
                     SfxBoolItem aItem( nSId, true );
                     GetViewFrame()->GetDispatcher()->Execute(
-                        nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                        nSId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
                     // Determine if a FILL attribute is set.
                     // If not, hard set a fill attribute
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c5d440cc9438..87bb4ad0f668 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -340,7 +340,7 @@ void OutlineViewShell::Activate( bool bIsMDIActivate )
     if ( ! mbInitialized)
     {
         mbInitialized = true;
-        SfxRequest aRequest (SID_EDIT_OUTLINER, 0, GetDoc()->GetItemPool());
+        SfxRequest aRequest (SID_EDIT_OUTLINER, SfxCallMode::SLOT, GetDoc()->GetItemPool());
         FuPermanent (aRequest);
     }
 
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 7ac22abfa48c..2f6a68ccb5f5 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -126,7 +126,7 @@ void PresentationViewShell::Activate( bool bIsMDIActivate )
     {
         SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
 
-        GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
 
         rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
         if( xSlideShow.is() )
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3a25f39be01d..fabc2aa506a8 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1054,8 +1054,8 @@ void View::onAccessibilityOptionsChanged()
                     nPreviewSlot = SID_PREVIEW_QUALITY_COLOR;
                 }
 
-                mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nOutputSlot, SFX_CALLMODE_ASYNCHRON );
-                mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nPreviewSlot, SFX_CALLMODE_ASYNCHRON );
+                mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nOutputSlot, SfxCallMode::ASYNCHRON );
+                mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nPreviewSlot, SfxCallMode::ASYNCHRON );
             }
 
             mpViewSh->Invalidate();
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index a1cb0f2c6740..e0a48d4f1cc2 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -19,6 +19,7 @@
 
 #include "View.hxx"
 #include <unotools/localfilehelper.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
@@ -471,7 +472,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
                         aLowerAsciiFileName.indexOf(".sti") != -1 )
                     {
                         ::sd::Window* pWin = mpViewSh->GetActiveWindow();
-                        SfxRequest      aReq(SID_INSERTFILE, 0, mrDoc.GetItemPool());
+                        SfxRequest      aReq(SID_INSERTFILE, ::SfxCallMode::SLOT, mrDoc.GetItemPool());
                         SfxStringItem   aItem1( ID_VAL_DUMMY0, aCurrentDropFile ), aItem2( ID_VAL_DUMMY1, pFoundFilter->GetFilterName() );
 
                         aReq.AppendItem( aItem1 );
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 6b83b61c829c..49149706a986 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -737,7 +737,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt )
                 if (pOldSettings->GetStyleSettings().GetScreenZoom()
                     != rNewSettings.GetStyleSettings().GetScreenZoom())
                     mpViewShell->GetViewFrame()->GetDispatcher()->
-                        Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                        Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
             /* Rearrange or initiate Resize for scroll bars since the size of
                the scroll bars my have changed. Within this, inside the resize-
@@ -780,7 +780,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt )
                     SetBackground( Wallpaper( aDocColor ) );
                 }
 
-                SfxRequest aReq( nPreviewSlot, 0, mpViewShell->GetDocSh()->GetDoc()->GetItemPool() );
+                SfxRequest aReq( nPreviewSlot, SfxCallMode::SLOT, mpViewShell->GetDocSh()->GetDoc()->GetItemPool() );
                 mpViewShell->ExecReq( aReq );
                 mpViewShell->Invalidate();
                 mpViewShell->ArrangeGUIElements();
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 45e395d76552..950cc7da480e 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -84,8 +84,8 @@ TabControl::~TabControl()
 void TabControl::Select()
 {
     SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-    pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON |
-                            SFX_CALLMODE_RECORD);
+    pDispatcher->Execute(SID_SWITCHPAGE, SfxCallMode::ASYNCHRON |
+                            SfxCallMode::RECORD);
 }
 
 void  TabControl::MouseButtonDown(const MouseEvent& rMEvt)
@@ -107,7 +107,7 @@ void  TabControl::MouseButtonDown(const MouseEvent& rMEvt)
             SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
 
             pDispatcher->Execute(SID_INSERTPAGE_QUICK,
-                                SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+                                SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
         }
     }
 
@@ -144,7 +144,7 @@ void TabControl::DoubleClick()
     {
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
         pDispatcher->Execute( SID_MODIFYPAGE,
-                        SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                        SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
     }
 }
 
@@ -216,7 +216,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 if( pDrViewSh->IsSwitchPageAllowed() && pDoc->MovePages( nPageId ) )
                 {
                     SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-                    pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                    pDispatcher->Execute(SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                 }
                 break;
 
@@ -250,7 +250,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt )
                         SetCurPageId (GetPageId(nPageNum));
                         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
                         pDispatcher->Execute(SID_SWITCHPAGE,
-                            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
                     }
                 }
 
@@ -342,7 +342,7 @@ void TabControl::ActivatePage()
     {
         SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
         pDispatcher->Execute(SID_SWITCHPAGE,
-                             SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+                             SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
     }
 }
 
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index fcfadf25d940..4c112ed5d7bf 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -114,7 +114,7 @@ void ModifyPageUndoAction::Undo()
 
     // Redisplay
     SfxViewFrame::Current()->GetDispatcher()->Execute(
-        SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 }
 
 void ModifyPageUndoAction::Redo()
@@ -157,7 +157,7 @@ void ModifyPageUndoAction::Redo()
 
     // Redisplay
     SfxViewFrame::Current()->GetDispatcher()->Execute(
-        SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
 }
 
 ModifyPageUndoAction::~ModifyPageUndoAction()
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 3cd27c9f5eab..7254f56709f4 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -302,7 +302,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd
             }
         }
 
-        mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON);
+        mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SfxCallMode::ASYNCHRON);
     }
     return false;
 }
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index a7ba45ecbe6b..3724d462142a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -643,7 +643,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
 
     // zoom onto (new) page size
     pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+            SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 
     Broadcast (ViewShellHint(ViewShellHint::HINT_PAGE_RESIZE_END));
 }
@@ -785,7 +785,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
             GetDocSh()->SetWaitCursor( false );
             pViewShell->GetViewFrame()->GetDispatcher()->Execute(
                 SID_INSERT_OBJECT,
-                SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+                SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
             xObj = pObj->GetObjRef();
             GetDocSh()->SetWaitCursor( true );
 
@@ -915,7 +915,7 @@ void ViewShell::ReadUserData(const OUString&)
 {
     // zoom onto VisArea from FrameView
     GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_VISAREA,
-        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+        SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
 }
 
 void ViewShell::WriteUserData(OUString&)
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index c1886cd5bf74..ca6dbb148183 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -278,7 +278,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
             Cancel();
 
             if(HasCurrentFunction( SID_BEZIER_EDIT ) )
-                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+                GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 #ifndef DISABLE_SCRIPTING
             StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 #endif
@@ -291,7 +291,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
         Cancel();
 
         if(HasCurrentFunction(SID_BEZIER_EDIT) )
-            GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+            GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON);
 #ifndef DISABLE_SCRIPTING
         StarBASIC::FatalError (SbERR_WRONG_ARGS);
 #endif
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 1dcf322653a4..343e4c4213dd 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -309,7 +309,7 @@ void ViewShell::Activate(bool bIsMDIActivate)
         if (GetDispatcher() != NULL)
             GetDispatcher()->Execute(
                 SID_NAVIGATOR_INIT,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                 &aItem,
                 0L);
 
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 9de5f084c4cf..f0dc0e735f03 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -150,7 +150,7 @@ bool ImplDdeService::MakeTopic( const OUString& rNm )
             SfxBoolItem aSilent(SID_SILENT, sal_True);
             SfxDispatcher* pDispatcher = SfxGetpApp()->GetDispatcher_Impl();
             const SfxPoolItem* pRet = pDispatcher->Execute( SID_OPENDOC,
-                    SFX_CALLMODE_SYNCHRON,
+                    SfxCallMode::SYNCHRON,
                     &aName, &aNewView,
                     &aSilent, 0L );
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 2b8c1ae5e0a8..0df4a09bcc9d 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -324,7 +324,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri
         SfxStringItem aReferer( SID_REFERER, OUString("private:user") );
         SfxStringItem aFlags( SID_OPTIONS, OUString("T") );
         SfxBoolItem aHidden( SID_HIDDEN, true );
-        const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L );
+        const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SfxCallMode::SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L );
         const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet );
         if ( pObj )
             xDoc = const_cast<SfxObjectShell*>(PTR_CAST( SfxObjectShell, pObj->GetShell() ));
@@ -423,7 +423,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
         aFactName = SvtModuleOptions().GetDefaultModuleName();
 
 
-    SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() );
+    SfxRequest aReq( SID_OPENDOC, SfxCallMode::SYNCHRON, GetPool() );
     OUString aFact("private:factory/");
     aFact += aFactName;
     aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) );
@@ -525,7 +525,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     }
     else
     {
-        SfxCallMode eMode = SFX_CALLMODE_SYNCHRON;
+        SfxCallMode eMode = SfxCallMode::SYNCHRON;
 
         const SfxPoolItem *pRet=0;
         SfxStringItem aReferer( SID_REFERER, "private:user" );
@@ -702,7 +702,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                 // when rescheduling
                 // TODO/LATER: use URLList argument and always remove one document after another, each step in asychronous execution, until finished
                 // but only if reschedule is a problem
-                GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs() );
+                GetDispatcher_Impl()->Execute( SID_OPENDOC, SfxCallMode::SYNCHRON, *rReq.GetArgs() );
 
                 // check for special interaction "NO MORE DOCUMENTS ALLOWED" and
                 // break loop then. Otherwise we risk showing the same interaction more than once.
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 13370f472e2d..0db333fe5953 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -183,7 +183,7 @@ namespace
             SfxStringItem aURL(SID_FILE_NAME, OUString(".component:Bibliography/View1"));
             SfxStringItem aRef(SID_REFERER, OUString("private:user"));
             SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
-            SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
+            SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SfxCallMode::ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
         }
         catch (const Exception & e)
         {
@@ -294,7 +294,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                 SfxStringItem aNameItem( SID_FILE_NAME, OUString("vnd.sun.star.cmd:logout") );
                 SfxStringItem aReferer( SID_REFERER, "private/user" );
-                pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SFX_CALLMODE_SLOT, &aNameItem, &aReferer, 0L );
+                pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SfxCallMode::SLOT, &aNameItem, &aReferer, 0L );
                 return;
             }
 
@@ -415,7 +415,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                   pObjSh;
                   pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
             {
-                SfxRequest aReq( SID_SAVEDOC, 0, pObjSh->GetPool() );
+                SfxRequest aReq( SID_SAVEDOC, SfxCallMode::SLOT, pObjSh->GetPool() );
                 if ( pObjSh->IsModified() )
                 {
                     pObjSh->ExecuteSlot( aReq );
@@ -623,7 +623,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     break;
             }
 
-            pCurrentShell->GetDispatcher()->Execute(SID_ATTR_ZOOM, SFX_CALLMODE_ASYNCHRON, &aZoom, 0L);
+            pCurrentShell->GetDispatcher()->Execute(SID_ATTR_ZOOM, SfxCallMode::ASYNCHRON, &aZoom, 0L);
 
             break;
         }
@@ -1087,7 +1087,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 SfxObjectShell* pObjShell = pView->GetObjectShell();
                 if ( pViewShell && pObjShell )
                 {
-                    SfxRequest aReq( SID_BASICIDE_SHOWWINDOW, SFX_CALLMODE_SYNCHRON, pObjShell->GetPool() );
+                    SfxRequest aReq( SID_BASICIDE_SHOWWINDOW, SfxCallMode::SYNCHRON, pObjShell->GetPool() );
                     aReq.SetArgs( *pArgs );
                     pViewShell->ExecuteSlot( aReq );
                 }
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index a416e2e60380..c36ebc45adbc 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -337,7 +337,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
 
     if ( pPick )
     {
-        SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, SfxGetpApp()->GetPool() );
+        SfxRequest aReq( SID_OPENDOC, SfxCallMode::ASYNCHRON, SfxGetpApp()->GetPool() );
         aReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPick->aName ));
         aReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) );
         aReq.AppendItem( SfxStringItem( SID_TARGETNAME, "_default" ) );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 33e49cd4056e..9da461ecfcbd 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -997,7 +997,7 @@ const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolIt
     if( !nId || !pDispatcher )
         return NULL;
 
-    return Execute_Impl( nId, ppItems, nModi, SFX_CALLMODE_SYNCHRON, ppInternalArgs );
+    return Execute_Impl( nId, ppItems, nModi, SfxCallMode::SYNCHRON, ppInternalArgs );
 }
 
 bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
@@ -1054,7 +1054,7 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem*
                 aReq.AppendItem( **ppItems++ );
 
         // cache binds to an external dispatch provider
-        pCache->Dispatch( aReq.GetArgs(), nCallMode == SFX_CALLMODE_SYNCHRON );
+        pCache->Dispatch( aReq.GetArgs(), nCallMode == SfxCallMode::SYNCHRON );
         SfxPoolItem *pVoid = new SfxVoidItem( nId );
         DeleteItemOnIdle( pVoid );
         return pVoid;
@@ -1121,7 +1121,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
         const sal_uInt16 nSlotId = pRealSlot->GetSlotId();
         aReq.SetSlot( nSlotId );
         aReq.AppendItem( SfxAllEnumItem( rPool.GetWhich(nSlotId), pSlot->GetValue() ) );
-        pDispatcher->_Execute( *pShell, *pRealSlot, aReq, aReq.GetCallMode() | SFX_CALLMODE_RECORD );
+        pDispatcher->_Execute( *pShell, *pRealSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
     }
     else if ( SFX_KIND_ATTR == pSlot->GetKind() )
     {
@@ -1201,10 +1201,10 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
             }
         }
 
-        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SFX_CALLMODE_RECORD );
+        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
     }
     else
-        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SFX_CALLMODE_RECORD );
+        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
 }
 
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index a1b2ea02f3ca..b471b3e45dc0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -836,8 +836,8 @@ void SfxDispatcher::_Execute(SfxShell& rShell, const SfxSlot& rSlot,
     if ( IsLocked( rSlot.GetSlotId() ) )
         return;
 
-    if ( (eCallMode & SFX_CALLMODE_ASYNCHRON) ||
-         ( !(eCallMode & SFX_CALLMODE_SYNCHRON) &&
+    if ( bool(eCallMode & SfxCallMode::ASYNCHRON) ||
+         ( (eCallMode & SfxCallMode::SYNCHRON) == SfxCallMode::SLOT &&
            rSlot.IsMode(SFX_SLOT_ASYNCHRON) ) )
     {
         SfxDispatcher *pDispat = this;
@@ -848,7 +848,7 @@ void SfxDispatcher::_Execute(SfxShell& rShell, const SfxSlot& rSlot,
             {
                 if ( &rShell == *(pDispat->pImp->aStack.rbegin() + n) )
                 {
-                    if ( eCallMode & SFX_CALLMODE_RECORD )
+                    if ( bool(eCallMode & SfxCallMode::RECORD) )
                         rReq.AllowRecording( true );
                     pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
                     return;
@@ -859,7 +859,7 @@ void SfxDispatcher::_Execute(SfxShell& rShell, const SfxSlot& rSlot,
         }
     }
     else
-        Call_Impl( rShell, rSlot, rReq, SFX_CALLMODE_RECORD==(eCallMode&SFX_CALLMODE_RECORD) );
+        Call_Impl( rShell, rSlot, rReq, SfxCallMode::RECORD==(eCallMode&SfxCallMode::RECORD) );
 }
 
 /** Helper function to put from rItem below the Which-ID in the pool of the
@@ -913,7 +913,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall,
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
     if ( GetShellAndSlot_Impl( nSlot,  &pShell, &pSlot, false,
-                               SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL) ) )
+                               SfxCallMode::MODAL==(nCall&SfxCallMode::MODAL) ) )
     {
         SfxAllItemSet aSet( pShell->GetPool() );
         if ( pArgs )
@@ -938,7 +938,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall,
 /** Method to excecute a <SfxSlot>s over the Slot-Id.
 
     @param nSlot the Id of the executing function
-    @param eCall SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or ..._SLOT
+    @param eCall SfxCallMode::SYNCRHON, ..._ASYNCHRON or ..._SLOT
     @param pArgs Zero teminated C-Array of Parameters
     @param pInternalArgs Zero terminated C-Array of Parameters
 
@@ -958,7 +958,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
     if ( GetShellAndSlot_Impl( nSlot,  &pShell, &pSlot, false,
-                               SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) )
+                               SfxCallMode::MODAL==(eCall&SfxCallMode::MODAL) ) )
     {
         SfxRequest* pReq;
         if ( pArgs && *pArgs )
@@ -988,7 +988,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
 /** Method to excecute a <SfxSlot>s over the Slot-Id.
 
     @param nSlot the Id of the executing function
-    @param eCall SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or ..._SLOT
+    @param eCall SfxCallMode::SYNCRHON, ..._ASYNCHRON or ..._SLOT
     @param rArgs <SfxItemSet> with the parameters
 
     @return const SfxPoolItem* Pointer to the SfxPoolItem valid to the next run
@@ -1013,7 +1013,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
     if ( GetShellAndSlot_Impl( nSlot,  &pShell, &pSlot, false,
-                               SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) )
+                               SfxCallMode::MODAL==(eCall&SfxCallMode::MODAL) ) )
     {
         SfxAllItemSet aSet( pShell->GetPool() );
         SfxItemIter aIter(rArgs);
@@ -1037,7 +1037,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
     of stack objects.
 
     @param nSlot the Id of the executing function
-    @param eCall SFX_CALLMODE_SYNCRHON, ..._ASYNCHRON or ..._SLOT
+    @param eCall SfxCallMode::SYNCRHON, ..._ASYNCHRON or ..._SLOT
     @param pArg1 First parameter
     @param ... Zero terminated list of parameters
 
@@ -1050,7 +1050,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
 
     [Example]
 
-    pDispatcher->Execute( SID_OPENDOCUMENT, SFX_CALLMODE_SYNCHRON,
+    pDispatcher->Execute( SID_OPENDOCUMENT, SfxCallMode::SYNCHRON,
         &SfxStringItem( SID_FILE_NAME, "\\tmp\\temp.sdd" ),
         &SfxStringItem( SID_FILTER_NAME, "StarDraw Presentation" ),
         &SfxBoolItem( SID_DOC_READONLY, sal_False ),
@@ -1065,7 +1065,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
     if ( GetShellAndSlot_Impl( nSlot, &pShell, &pSlot, false,
-                               SFX_CALLMODE_MODAL==(eCall&SFX_CALLMODE_MODAL) ) )
+                               SfxCallMode::MODAL==(eCall&SfxCallMode::MODAL) ) )
     {
        SfxAllItemSet aSet( pShell->GetPool() );
 
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index b3d8b0d79c1e..6c7d0a35d4ba 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -63,7 +63,7 @@ struct SfxRequest_Impl: public SfxListener
     bool            bDone;       // at all executed
     bool            bIgnored;    // Cancelled by the User
     bool            bCancelled;  // no longer notify
-    sal_uInt16      nCallMode;   // Synch/Asynch/API/Record
+    SfxCallMode     nCallMode;   // Synch/Asynch/API/Record
     bool            bAllowRecording;
     SfxAllItemSet*  pInternalArgs;
     SfxViewFrame*   pViewFrame;
@@ -80,7 +80,7 @@ struct SfxRequest_Impl: public SfxListener
                         , bDone(false)
                         , bIgnored(false)
                         , bCancelled(false)
-                        , nCallMode( SFX_CALLMODE_SYNCHRON )
+                        , nCallMode( SfxCallMode::SYNCHRON )
                         , bAllowRecording( false )
                         , pInternalArgs( 0 )
                         , pViewFrame(0)
@@ -191,7 +191,7 @@ SfxRequest::SfxRequest
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
-    pImp->nCallMode = SFX_CALLMODE_SYNCHRON;
+    pImp->nCallMode = SfxCallMode::SYNCHRON;
     pImp->pViewFrame = pViewFrame;
     if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, true, true ) )
     {
@@ -260,8 +260,8 @@ SfxRequest::SfxRequest
 SfxRequest::SfxRequest
 (
     sal_uInt16                  nSlotId,
-    sal_uInt16                  nMode,
-    const SfxAllItemSet&    rSfxArgs
+    SfxCallMode                 nMode,
+    const SfxAllItemSet&        rSfxArgs
 )
 
 // creates a SfxRequest with arguments
@@ -280,7 +280,7 @@ SfxRequest::SfxRequest
 }
 
 
-sal_uInt16 SfxRequest::GetCallMode() const
+SfxCallMode SfxRequest::GetCallMode() const
 {
     return pImp->nCallMode;
 }
@@ -289,7 +289,7 @@ sal_uInt16 SfxRequest::GetCallMode() const
 
 bool SfxRequest::IsSynchronCall() const
 {
-    return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
+    return SfxCallMode::SYNCHRON == ( SfxCallMode::SYNCHRON & pImp->nCallMode );
 }
 
 
@@ -297,9 +297,9 @@ bool SfxRequest::IsSynchronCall() const
 void SfxRequest::SetSynchronCall( bool bSynchron )
 {
     if ( bSynchron )
-        pImp->nCallMode |= SFX_CALLMODE_SYNCHRON;
+        pImp->nCallMode |= SfxCallMode::SYNCHRON;
     else
-        pImp->nCallMode &= ~(sal_uInt16) SFX_CALLMODE_SYNCHRON;
+        pImp->nCallMode &= ~SfxCallMode::SYNCHRON;
 }
 
 void SfxRequest::SetInternalArgs_Impl( const SfxAllItemSet& rArgs )
@@ -834,7 +834,7 @@ bool SfxRequest::IsAPI() const
 */
 
 {
-    return SFX_CALLMODE_API == ( SFX_CALLMODE_API & pImp->nCallMode );
+    return SfxCallMode::API == ( SfxCallMode::API & pImp->nCallMode );
 }
 
 
@@ -860,8 +860,8 @@ bool SfxRequest::AllowsRecording() const
 {
     bool bAllow = pImp->bAllowRecording;
     if( !bAllow )
-        bAllow = ( SFX_CALLMODE_API != ( SFX_CALLMODE_API & pImp->nCallMode ) ) &&
-                 ( SFX_CALLMODE_RECORD == ( SFX_CALLMODE_RECORD & pImp->nCallMode ) );
+        bAllow = ( SfxCallMode::API != ( SfxCallMode::API & pImp->nCallMode ) ) &&
+                 ( SfxCallMode::RECORD == ( SfxCallMode::RECORD & pImp->nCallMode ) );
     return bAllow;
 }
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 9bcbcea23353..752a2f75d4e4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -732,7 +732,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             addParametersToArgs( aURL, lNewArgs );
 
         // Try to find call mode and frame name inside given arguments...
-        SfxCallMode nCall = SFX_CALLMODE_STANDARD;
+        SfxCallMode nCall = SfxCallMode::RECORD;
         sal_Int32   nMarkArg = -1;
 
         // Filter arguments which shouldn't be part of the sequence property value
@@ -745,7 +745,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             {
                 bool    bTemp;
                 if( rProp.Value >>= bTemp )
-                    nCall = bTemp ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON;
+                    nCall = bTemp ? SfxCallMode::SYNCHRON : SfxCallMode::ASYNCHRON;
             }
             else if( rProp.Name == "Bookmark" )
             {
@@ -771,7 +771,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
 
         // Overwrite possible detected sychron argument, if real listener exists (currently no other way)
         if ( rListener.is() )
-            nCall = SFX_CALLMODE_SYNCHRON;
+            nCall = SfxCallMode::SYNCHRON;
 
         if( GetId() == SID_JUMPTOMARK && nMarkArg == - 1 )
         {
@@ -813,7 +813,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                 {
                     const SfxSlot *pSlot = 0;
                     if ( pDispatcher->GetShellAndSlot_Impl( GetId(), &pShell, &pSlot, false,
-                                                            SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL), false ) )
+                                                            SfxCallMode::MODAL==(nCall&SfxCallMode::MODAL), false ) )
                     {
                         if ( bMasterSlave )
                         {
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index faa709386790..534c8ab4d018 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -384,7 +384,7 @@ bool SfxModelessDialog::Close()
     SfxBoolItem aValue( pImp->pMgr->GetType(), false);
     pBindings->GetDispatcher_Impl()->Execute(
         pImp->pMgr->GetType(),
-        SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L );
+        SfxCallMode::RECORD|SfxCallMode::SYNCHRON, &aValue, 0L );
     return true;
 }
 
@@ -498,7 +498,7 @@ bool SfxFloatingWindow::Close()
     SfxBoolItem aValue( pImp->pMgr->GetType(), false);
     pBindings->GetDispatcher_Impl()->Execute(
             pImp->pMgr->GetType(),
-            SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L );
+            SfxCallMode::RECORD|SfxCallMode::SYNCHRON, &aValue, 0L );
     return true;
 }
 
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 7129fb300e8b..1e8d32d08320 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1678,7 +1678,7 @@ bool SfxDockingWindow::Close()
 
     SfxBoolItem aValue( pMgr->GetType(), false);
     pBindings->GetDispatcher_Impl()->Execute(
-        pMgr->GetType(), SFX_CALLMODE_RECORD | SFX_CALLMODE_ASYNCHRON, &aValue, 0L );
+        pMgr->GetType(), SfxCallMode::RECORD | SfxCallMode::ASYNCHRON, &aValue, 0L );
     return true;
 }
 
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index ccb6da5cf6d4..4e746944038a 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -142,7 +142,7 @@ SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
     SfxBoolItem aItem( FN_PARAM_1, true );
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
     if ( xRecorder.is() )
-        pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
+        pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SfxCallMode::SYNCHRON, &aItem, 0L );
 }
 
 bool SfxRecordingFloatWrapper_Impl::QueryClose()
@@ -195,7 +195,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
 
     // start recording
     SfxBoolItem aItem( SID_RECORDMACRO, true );
-    GetBindings().GetDispatcher()->Execute( SID_RECORDMACRO, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute( SID_RECORDMACRO, SfxCallMode::SYNCHRON, &aItem, 0L );
 }
 
 SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 688250db96db..05b443c726d6 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1679,7 +1679,7 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl(
     DeletionWatcher aDeleted(*this);
     sal_uInt16 nModi = pModifier ? *pModifier : 0;
     const SfxPoolItem* pItem = rDispatcher.Execute(
-        nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
+        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
         pItems, nModi );
 
     // Dialog can be destroyed while in Execute() because started
@@ -1782,7 +1782,7 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
         nActFamily = nEntry;
         SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
         SfxUInt16Item aItem( SID_STYLE_FAMILY, nEntry );
-        pDispat->Execute( SID_STYLE_FAMILY, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
+        pDispat->Execute( SID_STYLE_FAMILY, SfxCallMode::SYNCHRON, &aItem, 0L );
         pBindings->Invalidate( SID_STYLE_FAMILY );
         pBindings->Update( SID_STYLE_FAMILY );
         UpdateFamily_Impl();
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 5ada9dd90cc6..b63f4bbf8d26 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -270,7 +270,7 @@ namespace sfx2
             const SfxBoolItem aVisibility( nChildWindowId, false );
             GetBindings().GetDispatcher()->Execute(
                 nChildWindowId,
-                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
                 &aVisibility,
                 NULL
             );
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 970a5c5f683c..5b3ebd592afb 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -356,11 +356,11 @@ void SfxVersionDialog::Open_Impl()
         // there is a password, it should be used during the opening
         SfxUnoAnyItem aEncryptionDataItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) );
         pViewFrame->GetDispatcher()->Execute(
-            SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, &aEncryptionDataItem, 0L );
+            SID_OPENDOC, SfxCallMode::ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, &aEncryptionDataItem, 0L );
     }
     else
         pViewFrame->GetDispatcher()->Execute(
-            SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, 0L );
+            SID_OPENDOC, SfxCallMode::ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, 0L );
 
     Close();
 }
@@ -450,7 +450,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
         if ( pFilterOptItem )
             aSet.Put( *pFilterOptItem );
 
-        pViewFrame->GetDispatcher()->Execute( SID_DOCUMENT_COMPARE, SFX_CALLMODE_ASYNCHRON, aSet );
+        pViewFrame->GetDispatcher()->Execute( SID_DOCUMENT_COMPARE, SfxCallMode::ASYNCHRON, aSet );
         Close();
     }
     else if (pButton == m_pCmisButton)
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index de61da83e613..f3e2001790d9 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1455,7 +1455,7 @@ void AutoReloadTimer_Impl::Timeout()
             aSet.Put(
                 SfxStringItem(SID_REFERER, pObjSh->GetMedium()->GetName()));
         }
-        SfxRequest aReq( SID_RELOAD, 0, aSet );
+        SfxRequest aReq( SID_RELOAD, SfxCallMode::SLOT, aSet );
         pObjSh->Get_Impl()->pReloadTimer = 0;
         delete this;
         pFrame->ExecReload_Impl( aReq );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index e5d547753695..e1d3068ffe33 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -741,7 +741,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
         {
             SfxAllItemSet aArgs( GetPool() );
             aArgs.Put( SfxBoolItem( SID_SAVEACOPYITEM, true ) );
-            SfxRequest aSaveACopyReq( SID_EXPORTDOC, SFX_CALLMODE_API, aArgs );
+            SfxRequest aSaveACopyReq( SID_EXPORTDOC, SfxCallMode::API, aArgs );
             ExecFile_Impl( aSaveACopyReq );
             if ( !aSaveACopyReq.IsDone() )
             {
@@ -814,7 +814,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     SfxAllItemSet aArgs( GetPool() );
                     SfxStringItem aTmpItem( SID_FILE_NAME, pNameItem->GetValue() );
                     aArgs.Put( aTmpItem, aTmpItem.Which() );
-                    SfxRequest aSaveAsReq( SID_SAVEASDOC, SFX_CALLMODE_API, aArgs );
+                    SfxRequest aSaveAsReq( SID_SAVEASDOC, SfxCallMode::API, aArgs );
                     ExecFile_Impl( aSaveAsReq );
                     if ( !aSaveAsReq.IsDone() )
                     {
@@ -1267,7 +1267,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
                     SfxStringItem aName( SID_FILE_NAME, aFileName );
                     SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, true );
                     SfxGetpApp()->GetAppDispatcher_Impl()->Execute(
-                        SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aName,
+                        SID_OPENDOC, SfxCallMode::ASYNCHRON, &aName,
                         &aCreateView, 0L);
                 }
             }
@@ -1432,7 +1432,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
                 sal_uInt16 nId = SID_SAVEDOC;
                 if ( !GetMedium() || GetMedium()->GetName().isEmpty() )
                     nId = SID_SAVEASDOC;
-                SfxRequest aSaveRequest( nId, 0, GetPool() );
+                SfxRequest aSaveRequest( nId, SfxCallMode::SLOT, GetPool() );
                 //ToDo: Review. We needed to call SetModified, otherwise the document would not be saved.
                 SetModified(true);
                 ExecFile_Impl( aSaveRequest );
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 054abf843993..4e64860c7d06 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -949,7 +949,7 @@ const SfxPoolItem* SfxFrame::OpenDocumentSynchron( SfxItemSet& i_rSet, const Ref
 {
     i_rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, i_rTargetFrame ) );
     i_rSet.ClearItem( SID_TARGETNAME );
-    return SfxGetpApp()->GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, i_rSet );
+    return SfxGetpApp()->GetDispatcher_Impl()->Execute( SID_OPENDOC, SfxCallMode::SYNCHRON, i_rSet );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 521972330501..044fb1c15e5f 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -343,7 +343,7 @@ namespace
 bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame,
                                                               const bool i_bHidden )
 {
-    SfxRequest aRequest( _nSlotID, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() );
+    SfxRequest aRequest( _nSlotID, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() );
     aRequest.AppendItem( SfxUnoFrameItem( SID_FILLFRAME, i_rxFrame ) );
     if ( i_bHidden )
         aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, true ) );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5b47c7c34b60..b0c06b9aabd7 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -361,7 +361,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                         aSet.Put( *pOptions );
                 }
 
-                GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet );
+                GetDispatcher()->Execute( SID_OPENDOC, SfxCallMode::ASYNCHRON, aSet );
                 return;
             }
 
@@ -520,7 +520,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                                     aSet.Put( *pOptions );
                             }
 
-                            GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet );
+                            GetDispatcher()->Execute( SID_OPENDOC, SfxCallMode::ASYNCHRON, aSet );
                             return;
                         }
                         else
@@ -772,7 +772,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                             aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) );
                             if( pFilter )
                                 aSet.Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetFilterName() ) );
-                            GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet );
+                            GetDispatcher()->Execute( SID_OPENDOC, SfxCallMode::ASYNCHRON, aSet );
                         }
                     }
                 }
@@ -2601,7 +2601,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
         return;
 
     SfxApplication* pSfxApp = SfxGetpApp();
-    SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pSfxApp->GetPool() );
+    SfxRequest aReq( SID_BASICCHOOSER, SfxCallMode::SYNCHRON, pSfxApp->GetPool() );
     aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,true) );
     const SfxPoolItem* pRet = SfxGetpApp()->ExecuteSlot( aReq );
     OUString aScriptURL;
@@ -2764,7 +2764,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
                 if ( pDispat )
                 {
                     SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLibName, aModuleName, OUString(), OUString() );
-                    pDispat->Execute( SID_BASICIDE_UPDATEMODULESOURCE, SFX_CALLMODE_SYNCHRON, &aInfoItem, 0L );
+                    pDispat->Execute( SID_BASICIDE_UPDATEMODULESOURCE, SfxCallMode::SYNCHRON, &aInfoItem, 0L );
                 }
             }
         }
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 531f1b433ac3..cd9f43c1494b 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -218,7 +218,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
                 break;
             }
 
-            SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() );
+            SfxRequest aReq( SID_OPENDOC, SfxCallMode::SYNCHRON, GetPool() );
             OUString aFact("private:factory/");
             aFact += aFactName;
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index e82def5003f4..4eb4d4b375ee 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1877,7 +1877,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark )
     SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark );
     GetViewFrame()->GetDispatcher()->Execute(
         SID_JUMPTOMARK,
-        SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+        SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
         &aMarkItem, 0L );
 }
 
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 3889c40d29c8..fe4b7ef008f4 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -185,7 +185,7 @@ void Test::editUndoRedo()
         CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText);
     }
 
-    SfxRequest aUndo(SID_UNDO, SFX_CALLMODE_SYNCHRON, m_xDocShRef->GetPool());
+    SfxRequest aUndo(SID_UNDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
 
     {
         m_xDocShRef->Execute(aUndo);
@@ -201,7 +201,7 @@ void Test::editUndoRedo()
         CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength());
     }
 
-    SfxRequest aRedo(SID_REDO, SFX_CALLMODE_SYNCHRON, m_xDocShRef->GetPool());
+    SfxRequest aRedo(SID_REDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
     {
         m_xDocShRef->Execute(aRedo);
         m_xDocShRef->UpdateText();
@@ -238,14 +238,14 @@ void Test::viewZoom()
     nOrigZoom = rGraphicWindow.GetZoom();
 
     {
-        SfxRequest aZoomIn(SID_ZOOMIN, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoomIn(SID_ZOOMIN, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomIn);
         nNextZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be bigger", nNextZoom > nOrigZoom);
     }
 
     {
-        SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoomOut(SID_ZOOMOUT, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomOut);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be equal", nFinalZoom == nOrigZoom);
@@ -254,7 +254,7 @@ void Test::viewZoom()
     sal_uInt16 nOptimalZoom=0;
 
     {
-        SfxRequest aZoom(SID_ZOOM_OPTIMAL, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoom(SID_ZOOM_OPTIMAL, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoom);
         nOptimalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be about 800%", nOptimalZoom > nOrigZoom);
@@ -263,7 +263,7 @@ void Test::viewZoom()
     {
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_OPTIMAL, 0));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be optimal zoom", nFinalZoom == nOptimalZoom);
@@ -273,28 +273,28 @@ void Test::viewZoom()
 //consistent value regardless of
 #if 0
     {
-        SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoomOut(SID_ZOOMOUT, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomOut);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom);
 
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_PAGEWIDTH, 0));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be same as optimal zoom", nFinalZoom == nOptimalZoom);
     }
 
     {
-        SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoomOut(SID_ZOOMOUT, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomOut);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom);
 
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_WHOLEPAGE, 0));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be same as optimal zoom", nFinalZoom == nOptimalZoom);
@@ -302,14 +302,14 @@ void Test::viewZoom()
 #endif
 
     {
-        SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
+        SfxRequest aZoomOut(SID_ZOOMOUT, SfxCallMode::SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomOut);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom);
 
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_PERCENT, 50));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be 50%", nFinalZoom == 50);
@@ -318,7 +318,7 @@ void Test::viewZoom()
     {
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_PERCENT, 5));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be Clipped to 25%", nFinalZoom == 25);
@@ -327,7 +327,7 @@ void Test::viewZoom()
     {
         SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
         aSet.Put(SvxZoomItem(SVX_ZOOM_PERCENT, 1000));
-        SfxRequest aZoom(SID_ATTR_ZOOM, SFX_CALLMODE_SYNCHRON, aSet);
+        SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
         m_pViewShell->Execute(aZoom);
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be Clipped to 800%", nFinalZoom == 800);
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 059a1d1c00c7..9ea3b2cebfb7 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -669,7 +669,7 @@ IMPL_LINK( SmElementsDockingWindow, SelectClickHdl, SmElement*, pElement)
     if (pViewSh)
     {
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-            SID_INSERTCOMMANDTEXT, SFX_CALLMODE_STANDARD,
+            SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
             new SfxStringItem(SID_INSERTCOMMANDTEXT, pElement->getText()), 0L);
     }
     return 0;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e731fb6bc6d0..272405ba5164 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1439,7 +1439,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl )
         aText.append('%').append(pSym->GetName()).append(' ');
 
         rViewSh.GetViewFrame()->GetDispatcher()->Execute(
-                SID_INSERTSYMBOL, SFX_CALLMODE_STANDARD,
+                SID_INSERTSYMBOL, SfxCallMode::RECORD,
                 new SfxStringItem(SID_INSERTSYMBOL, aText.makeStringAndClear()), 0L);
     }
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 9ab5776e9810..f7a751a7b743 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -397,7 +397,7 @@ IMPL_LINK_INLINE_START( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
     SmViewShell *pViewSh = rCmdBox.GetView();
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                SID_INSERTCOMMAND, SFX_CALLMODE_STANDARD,
+                SID_INSERTCOMMAND, SfxCallMode::RECORD,
                 new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()), 0L);
     return 0;
 }
@@ -1078,7 +1078,7 @@ void SmEditWindow::Flush()
         if (pViewSh)
         {
             pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                    SID_TEXT, SFX_CALLMODE_STANDARD,
+                    SID_TEXT, SfxCallMode::RECORD,
                     new SfxStringItem(SID_TEXT, GetText()), 0L);
         }
     }
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 04a93553be68..7b64e3c09516 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -240,7 +240,7 @@ bool SmToolBoxWindow::Close()
     SmViewShell *pViewSh = GetView();
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                SID_TOOLBOX, SFX_CALLMODE_STANDARD,
+                SID_TOOLBOX, SfxCallMode::RECORD,
                 new SfxBoolItem(SID_TOOLBOX, false), 0L);
     return true;
 }
@@ -334,7 +334,7 @@ IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
     SmViewShell *pViewSh = GetView();
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                SID_INSERTCOMMAND, SFX_CALLMODE_STANDARD,
+                SID_INSERTCOMMAND, SfxCallMode::RECORD,
                 new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L);
     return 0;
 }
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index f9c77ca2b4ca..075941d4d670 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1603,7 +1603,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                 if (pWin->IsAllSelected())
                 {
                     GetViewFrame()->GetDispatcher()->Execute(
-                                SID_COPYOBJECT, SFX_CALLMODE_STANDARD,
+                                SID_COPYOBJECT, SfxCallMode::RECORD,
                                 new SfxVoidItem(SID_COPYOBJECT), 0L);
                 }
                 else
@@ -1629,7 +1629,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                 if( bCallExec )
                 {
                     GetViewFrame()->GetDispatcher()->Execute(
-                            SID_PASTEOBJECT, SFX_CALLMODE_STANDARD,
+                            SID_PASTEOBJECT, SfxCallMode::RECORD,
                             new SfxVoidItem(SID_PASTEOBJECT), 0L);
                 }
             }
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 855938ba4de8..3d538fcc9bdb 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -38,7 +38,7 @@
 
 #define BMP_RESID(nId)  ResId(nId, DIALOG_MGR())
 #define TRANSP_COL      (Color( 252, 252, 252 ))
-#define OWN_CALLMODE    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD
+#define OWN_CALLMODE    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD
 
 
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 688ed456081c..9b471b4b5aba 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -291,7 +291,7 @@ bool SvxSuperContourDlg::Close()
         {
             SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
             GetBindings().GetDispatcher()->Execute(
-                SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
+                SID_CONTOUR_EXEC, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
         }
         else if ( nRet == RET_CANCEL )
             bRet = false;
@@ -410,7 +410,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
     {
         SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
         GetBindings().GetDispatcher()->Execute(
-            SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
+            SID_CONTOUR_EXEC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
     }
     else if (nId == mnWorkSpaceId)
     {
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 17d0d55d3d76..e18752492ba9 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -503,7 +503,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
                     XFormTextShadowYValItem aYItem( nSaveShadowY );
 
                     GetBindings().GetDispatcher()->Execute(
-                        SID_FORMTEXT_SHDWXVAL, SFX_CALLMODE_RECORD, &aXItem, &aYItem, 0L );
+                        SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD, &aXItem, &aYItem, 0L );
                 }
             }
             else
@@ -529,7 +529,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
                     XFormTextShadowXValItem aXItem(nSaveShadowAngle);
                     XFormTextShadowYValItem aYItem(nSaveShadowSize);
                     GetBindings().GetDispatcher()->Execute(
-                        SID_FORMTEXT_SHDWXVAL, SFX_CALLMODE_RECORD, &aXItem, &aYItem, 0L );
+                        SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD, &aXItem, &aYItem, 0L );
                 }
             }
         }
@@ -633,7 +633,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl)
             case TBI_STYLE_SLANTY   : eStyle = XFT_SLANTY;  break;
         }
         XFormTextStyleItem aItem( eStyle );
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STYLE, SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STYLE, SfxCallMode::RECORD, &aItem, 0L );
         SetStyle_Impl( &aItem );
         nLastStyleTbxId = nId;
     }
@@ -647,7 +647,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl)
     if ( nId == TBI_ADJUST_MIRROR )
     {
         XFormTextMirrorItem aItem(aTbxAdjust.IsItemChecked(nId));
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_MIRROR, SFX_CALLMODE_SLOT, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_MIRROR, SfxCallMode::SLOT, &aItem, 0L );
     }
     else if ( nId != nLastAdjustTbxId )
     {
@@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl)
             case TBI_ADJUST_RIGHT   : eAdjust = XFT_RIGHT;  break;
         }
         XFormTextAdjustItem aItem(eAdjust);
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_ADJUST, SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_ADJUST, SfxCallMode::RECORD, &aItem, 0L );
         SetAdjust_Impl(&aItem);
         nLastAdjustTbxId = nId;
     }
@@ -674,12 +674,12 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
     if ( nId == TBI_SHOWFORM )
     {
         XFormTextHideFormItem aItem(!aTbxShadow.IsItemChecked(nId));
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_HIDEFORM, SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_HIDEFORM, SfxCallMode::RECORD, &aItem, 0L );
     }
     else if ( nId == TBI_OUTLINE )
     {
         XFormTextOutlineItem aItem(aTbxShadow.IsItemChecked(nId));
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_OUTLINE, SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_OUTLINE, SfxCallMode::RECORD, &aItem, 0L );
     }
     else if ( nId != nLastShadowTbxId )
     {
@@ -701,7 +701,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
         else if ( nId == TBI_SHADOW_SLANT ) eShadow = XFTSHADOW_SLANT;
 
         XFormTextShadowItem aItem(eShadow);
-        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SfxCallMode::RECORD, &aItem, 0L );
         SetShadow_Impl(&aItem, true);
     }
     return 0;
@@ -763,7 +763,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
     XFormTextShadowYValItem aShadowYItem( nValueY );
 
     // Slot-ID does not matter, the Exec method evaluates the entire item set
-    GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SFX_CALLMODE_RECORD, &aDistItem,
+    GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SfxCallMode::RECORD, &aDistItem,
                                             &aStartItem, &aShadowXItem, &aShadowYItem, 0L );
     return 0;
 }
@@ -771,7 +771,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
 IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
 {
     XFormTextShadowColorItem aItem( "", aShadowColorLB.GetSelectEntryColor() );
-    GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SfxCallMode::RECORD, &aItem, 0L );
     return 0;
 }
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a40c91ec71e6..5c247de2944b 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -238,7 +238,7 @@ bool SvxIMapDlg::Close()
         {
             SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
             GetBindings().GetDispatcher()->Execute(
-                SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
+                SID_IMAP_EXEC, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
         }
         else if( nRet == RET_CANCEL )
             bRet = false;
@@ -338,7 +338,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
         URLLoseFocusHdl( NULL );
         SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
         GetBindings().GetDispatcher()->Execute(
-            SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
+            SID_IMAP_EXEC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
     }
     else if(nNewItemId == mnOpenId)
         DoOpen();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 83a6e5e28749..e70c51681306 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -281,8 +281,8 @@ void SvxRubyDialog::ClearCharStyleList()
 bool    SvxRubyDialog::Close()
 {
     pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG,
-                              SFX_CALLMODE_ASYNCHRON |
-                              SFX_CALLMODE_RECORD);
+                              SfxCallMode::ASYNCHRON |
+                              SfxCallMode::RECORD);
     return true;
 }
 
@@ -568,8 +568,8 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl)
     if(eState <= SfxItemState::SET || !pState || !((SfxBoolItem*)pState)->GetValue())
     {
         pBindings->GetDispatcher()->Execute( SID_STYLE_DESIGNER,
-                              SFX_CALLMODE_ASYNCHRON |
-                              SFX_CALLMODE_RECORD);
+                              SfxCallMode::ASYNCHRON |
+                              SfxCallMode::RECORD);
     }
     delete pState;
     return 0;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index aaad310bfb98..d5230e38f4c9 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -389,13 +389,13 @@ void SvxSearchDialog::Construct_Impl()
     // Get attribute sets only once in construtor()
     const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
     const SvxSetItem* pSrchSetItem =
-        (const SvxSetItem*) rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SFX_CALLMODE_SLOT, ppArgs );
+        (const SvxSetItem*) rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs );
 
     if ( pSrchSetItem )
         InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 );
 
     const SvxSetItem* pReplSetItem =
-        (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SFX_CALLMODE_SLOT, ppArgs );
+        (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs );
 
     if ( pReplSetItem )
         InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() );
@@ -407,7 +407,7 @@ void SvxSearchDialog::Construct_Impl()
     pOptionsController =
         new SvxSearchController( SID_SEARCH_OPTIONS, rBindings, *this );
     rBindings.LeaveRegistrations();
-    rBindings.GetDispatcher()->Execute( FID_SEARCH_ON, SFX_CALLMODE_SLOT, ppArgs );
+    rBindings.GetDispatcher()->Execute( FID_SEARCH_ON, SfxCallMode::SLOT, ppArgs );
     pImpl->aSelectionTimer.Start();
 
 
@@ -517,7 +517,7 @@ bool SvxSearchDialog::Close()
     aOpt.SetIgnoreKashida_CTL       ( m_pIgnoreKashida->IsChecked() );
 
     const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
-    rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs );
+    rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT, ppArgs );
     rBindings.Execute( SID_SEARCH_DLG );
 
     return true;
@@ -822,13 +822,13 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
                 // Get attribute sets, if it not has been done already
                 const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
                 const SvxSetItem* pSrchSetItem =
-                (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SFX_CALLMODE_SLOT, ppArgs );
+                (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs );
 
                 if ( pSrchSetItem )
                     InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 );
 
                 const SvxSetItem* pReplSetItem =
-                (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SFX_CALLMODE_SLOT, ppArgs );
+                (const SvxSetItem*)rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs );
 
                 if ( pReplSetItem )
                     InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() );
@@ -2191,7 +2191,7 @@ void SvxSearchDialog::SaveToModule_Impl()
     pSearchItem->SetCommand( SVX_SEARCHCMD_FIND );
     nModifyFlag = 0;
     const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
-    rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SFX_CALLMODE_SLOT, ppArgs );
+    rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SfxCallMode::SLOT, ppArgs );
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 7c5a71308679..a7b287a52465 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2070,7 +2070,7 @@ void SvxRuler::ApplyMargins()
 #endif // DEBUGLIN
 
     }
-    pBindings->GetDispatcher()->Execute( nId, SFX_CALLMODE_RECORD, pItem, 0L );
+    pBindings->GetDispatcher()->Execute( nId, SfxCallMode::RECORD, pItem, 0L );
     if(mpTabStopItem.get())
         UpdateTabs();
 }
@@ -2176,7 +2176,7 @@ void SvxRuler::ApplyIndents()
     mpParaItem->SetRight(nNewRight);
 
     sal_uInt16 nParagraphId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
-    pBindings->GetDispatcher()->Execute( nParagraphId, SFX_CALLMODE_RECORD, mpParaItem.get(), 0L );
+    pBindings->GetDispatcher()->Execute( nParagraphId, SfxCallMode::RECORD, mpParaItem.get(), 0L );
     UpdateTabs();
 }
 
@@ -2256,7 +2256,7 @@ void SvxRuler::ApplyTabs()
         mpTabStopItem->Insert(aTabStop);
     }
     sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
-    pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, mpTabStopItem.get(), 0L );
+    pBindings->GetDispatcher()->Execute( nTabStopId, SfxCallMode::RECORD, mpTabStopItem.get(), 0L );
     UpdateTabs();
 }
 
@@ -2318,7 +2318,7 @@ void SvxRuler::ApplyBorders()
     sal_uInt16 nColId = mpRulerImpl->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
                             (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
 
-    pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, mpColumnItem.get(), &aFlag, 0L );
+    pBindings->GetDispatcher()->Execute( nColId, SfxCallMode::RECORD, mpColumnItem.get(), &aFlag, 0L );
 }
 
 void SvxRuler::ApplyObject()
@@ -2356,7 +2356,7 @@ void SvxRuler::ApplyObject()
                     mpObjectItem->GetEndY());
     mpObjectItem->SetEndY(nEndY);
 
-    pBindings->GetDispatcher()->Execute(SID_RULER_OBJECT, SFX_CALLMODE_RECORD, mpObjectItem.get(), 0L);
+    pBindings->GetDispatcher()->Execute(SID_RULER_OBJECT, SfxCallMode::RECORD, mpObjectItem.get(), 0L);
 }
 
 void SvxRuler::PrepareProportional_Impl(RulerType eType)
@@ -3399,7 +3399,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
         mpTabStopItem->Remove(mpRulerImpl->nIdx);
         mpTabStopItem->Insert(aTabStop);
         sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
-        pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, mpTabStopItem.get(), 0L );
+        pBindings->GetDispatcher()->Execute( nTabStopId, SfxCallMode::RECORD, mpTabStopItem.get(), 0L );
         UpdateTabs();
         mpRulerImpl->nIdx = 0;
     }
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d418277476cb..d95fbd82171d 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -341,7 +341,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     {
         SfxBoolItem aItem( SID_3D_INIT, true );
         pDispatcher->Execute(
-            SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+            SID_3D_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
     }
 
     Reset();
@@ -2321,7 +2321,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl)
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(
-                SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
         }
     }
     else
@@ -2340,7 +2340,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl)
     {
         SfxBoolItem aItem( SID_3D_ASSIGN, true );
         pDispatcher->Execute(
-            SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+            SID_3D_ASSIGN, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
     }
 
     return( 0L );
@@ -2759,7 +2759,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             {
                 SfxBoolItem aItem( nSId, true );
                 pDispatcher->Execute(
-                    nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                    nSId, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
             }
         }
         else if( bUpdatePreview )
@@ -3081,7 +3081,7 @@ void Svx3DWin::UpdatePreview()
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(
-                SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+                SID_3D_STATE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
         }
         // Reset Flag
         bOnly3DChanged = false;
@@ -3276,7 +3276,7 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState,
         {
             SfxBoolItem aItem( SID_3D_STATE, true );
             pDispatcher->Execute(
-                SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
+                SID_3D_STATE, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD, &aItem, 0L);
         }
     }
 }
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 5db0927a4008..68bebd6f563e 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -956,7 +956,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
             FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
             SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
 
-            pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
+            pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
                                       &aIFaceItem, &aShowItem, 0L );
         }
     }
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 1383fed692eb..1744605a3e44 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -512,7 +512,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 NULL
             };
 
-            GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_CREATE_CONTROL, SFX_CALLMODE_ASYNCHRON,
+            GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_CREATE_CONTROL, SfxCallMode::ASYNCHRON,
                                       pArgs, rReq.GetModifier(), pInternalArgs );
 
             if ( rReq.GetModifier() & KEY_MOD1 )
@@ -522,7 +522,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 // reusing the SID_FM_TOGGLECONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another
                 // name, so I do not really have a big problem with this ....
                 SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, true );
-                GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON,
+                GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SfxCallMode::ASYNCHRON,
                                           &aGrabFocusIndicatorItem, NULL );
             }
 
@@ -817,7 +817,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
 
             // initially open the filter navigator, the whole form based filter is pretty useless without it
             SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, true );
-            GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
+            GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SfxCallMode::ASYNCHRON,
                 &aIdentifierItem, NULL );
         }   break;
     }
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 38e4ad6482ee..faf0daeb9904 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2854,7 +2854,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
         // So we can't call ShowSelectionProperties directly as the according feature isn't enabled yet.
         // That's why we use an asynchron execution on the dispatcher.
         // (And that's why this has to be done AFTER the UIFeatureChanged.)
-        m_pShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON );
+        m_pShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON );
     }
     m_bChangingDesignMode = false;
 }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index b88efa16cabd..a1867c7e49e0 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1663,7 +1663,7 @@ namespace svxform
         if ( pFormShell->GetImpl()->IsPropBrwOpen() || bForce )
         {
             // und jetzt kann ich das Ganze dem PropertyBrowser uebergeben
-            pFormShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON );
+            pFormShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON );
         }
     }
 
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 59941c470ea1..9b9c71824428 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -242,7 +242,7 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
 
         if( !pFloater )
         {
-            SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( SID_AVMEDIA_PLAYER, SFX_CALLMODE_SYNCHRON );
+            SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute( SID_AVMEDIA_PLAYER, SfxCallMode::SYNCHRON );
             pFloater = avmedia::getMediaFloater();
         }
 
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 5dc91c703b07..6ffe39543d59 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -181,9 +181,9 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
     }
 
     // ohne dispatcher!!!
-    // GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden items, 0L );*/
+    // GetBindings().Execute( GetId(), SfxCallMode::RECORD,meine beiden items, 0L );*/
     //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
-    //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
+    //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L );
 
     return 0;
 }
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 6ef5157b5cbf..a9d35b5ce49c 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -138,7 +138,7 @@ IMPL_LINK_INLINE_START( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
 {
     SvxFontItem aItem( GetId() );
     aItem.SetFamilyName(pMen->GetCurName());
-    GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
     return 0;
 }
 IMPL_LINK_INLINE_END( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index dae879db0e1f..c3d992e97552 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -61,7 +61,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
     const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
     long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
     SvxFontHeightItem aItem( nH, 100, GetId() );
-    GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
     return 1;
 }
 
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 2081fcad61b8..fe23425a4b2a 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -229,7 +229,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
 
                 // #i122676# need to call a single SID_ATTR_FILL_STYLE change
                 GetBindings()->GetDispatcher()->Execute(
-                    SID_ATTR_FILL_STYLE, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L);
+                    SID_ATTR_FILL_STYLE, SfxCallMode::RECORD, &aXFillStyleItem, 0L);
                 break;
             }
             case drawing::FillStyle_SOLID:
@@ -242,7 +242,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
 
                 // #i122676# change FillStyle and Color in one call
                 GetBindings()->GetDispatcher()->Execute(
-                    SID_ATTR_FILL_COLOR, SFX_CALLMODE_RECORD, &aXFillColorItem, &aXFillStyleItem, 0L);
+                    SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, &aXFillColorItem, &aXFillStyleItem, 0L);
                 break;
             }
             case drawing::FillStyle_GRADIENT:
@@ -273,7 +273,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
 
                             // #i122676# change FillStyle and Gradient in one call
                             GetBindings()->GetDispatcher()->Execute(
-                                SID_ATTR_FILL_GRADIENT, SFX_CALLMODE_RECORD, &aXFillGradientItem, &aXFillStyleItem, 0L);
+                                SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &aXFillGradientItem, &aXFillStyleItem, 0L);
                             mpLbFillAttr->SelectEntryPos(mnLastPosGradient);
                         }
                     }
@@ -312,7 +312,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
 
                             // #i122676# change FillStyle and Hatch in one call
                             GetBindings()->GetDispatcher()->Execute(
-                                SID_ATTR_FILL_HATCH, SFX_CALLMODE_RECORD, &aXFillHatchItem, &aXFillStyleItem, 0L);
+                                SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &aXFillHatchItem, &aXFillStyleItem, 0L);
                             mpLbFillAttr->SelectEntryPos(mnLastPosHatch);
                         }
                     }
@@ -351,7 +351,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
 
                             // #i122676# change FillStyle and Bitmap in one call
                             GetBindings()->GetDispatcher()->Execute(
-                                SID_ATTR_FILL_BITMAP, SFX_CALLMODE_RECORD, &aXFillBitmapItem, &aXFillStyleItem, 0L);
+                                SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &aXFillBitmapItem, &aXFillStyleItem, 0L);
                             mpLbFillAttr->SelectEntryPos(mnLastPosBitmap);
                         }
                     }
@@ -399,7 +399,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
                 if(bFillStyleChange)
                 {
                     // #i122676# Single FillStyle change call needed here
-                    GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_STYLE, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L);
+                    GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_STYLE, SfxCallMode::RECORD, &aXFillStyleItem, 0L);
                 }
                 break;
             }
@@ -423,7 +423,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
 
                         // #i122676# Change FillStale and Gradinet in one call
                         GetBindings()->GetDispatcher()->Execute(
-                            SID_ATTR_FILL_GRADIENT, SFX_CALLMODE_RECORD, &aXFillGradientItem,
+                            SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &aXFillGradientItem,
                             bFillStyleChange ? &aXFillStyleItem : 0L, 0L);
                     }
                 }
@@ -454,7 +454,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
 
                         // #i122676# Change FillStale and Hatch in one call
                         GetBindings()->GetDispatcher()->Execute(
-                            SID_ATTR_FILL_HATCH, SFX_CALLMODE_RECORD, &aXFillHatchItem,
+                            SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &aXFillHatchItem,
                             bFillStyleChange ? &aXFillStyleItem : 0L, 0L);
                     }
                 }
@@ -485,7 +485,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
 
                         // #i122676# Change FillStale and Bitmap in one call
                         GetBindings()->GetDispatcher()->Execute(
-                            SID_ATTR_FILL_BITMAP, SFX_CALLMODE_RECORD, &aXFillBitmapItem,
+                            SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &aXFillBitmapItem,
                             bFillStyleChange ? &aXFillStyleItem : 0L, 0L);
                     }
                 }
@@ -532,7 +532,7 @@ void AreaPropertyPanel::SetColor (
     const Color aColor)
 {
     const XFillColorItem aXFillColorItem(rsColorName, aColor);
-    mpBindings->GetDispatcher()->Execute(SID_ATTR_FILL_COLOR, SFX_CALLMODE_RECORD, &aXFillColorItem, 0L);
+    mpBindings->GetDispatcher()->Execute(SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, &aXFillColorItem, 0L);
     maLastColor = aColor;
 }
 
@@ -1264,7 +1264,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
     }
 
     const XFillTransparenceItem aLinearItem(nTrans);
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SfxCallMode::RECORD, &aLinearItem, 0L );
 
     if(nSelectType > 1)
     {
@@ -1297,7 +1297,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
 
     SfxItemPool* pPool = 0;
     const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient);
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SfxCallMode::RECORD, &aGradientItem, 0L );
 
     return( 0L );
 }
@@ -1316,7 +1316,7 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG)
     }
 
     const XFillTransparenceItem aLinearItem(nTrans);
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SfxCallMode::RECORD, &aLinearItem, 0L );
 
     return 0L;
 }
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 6d6690c77d84..7c6a10383b5e 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -281,7 +281,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s
     bool bEnable = true;
     XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable );
 
-    mpBindings->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
+    mpBindings->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SfxCallMode::RECORD, &aGradientItem, 0L );
 }
 
 
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 720062e5224a..dd371dfa0861 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -131,7 +131,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
 {
     const sal_Int16 nBright = mpMtrBrightness->GetValue();
     const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_LUMINANCE, SFX_CALLMODE_RECORD, &aBrightItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_LUMINANCE, SfxCallMode::RECORD, &aBrightItem, 0L);
     return 0L;
 }
 
@@ -141,7 +141,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
 {
     const sal_Int16 nContrast = mpMtrContrast->GetValue();
     const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_CONTRAST, SFX_CALLMODE_RECORD, &aContrastItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_CONTRAST, SfxCallMode::RECORD, &aContrastItem, 0L);
     return 0L;
 }
 
@@ -151,7 +151,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
 {
     const sal_Int16 nTrans = mpMtrTrans->GetValue();
     const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_TRANSPARENCE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_TRANSPARENCE, SfxCallMode::RECORD, &aTransItem, 0L);
     return 0L;
 }
 
@@ -161,7 +161,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl )
 {
     const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
     const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_MODE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_MODE, SfxCallMode::RECORD, &aTransItem, 0L);
     return 0L;
 }
 
@@ -171,7 +171,7 @@ IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
 {
     const sal_Int16 nRed = mpMtrRed->GetValue();
     const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_RED, SFX_CALLMODE_RECORD, &aRedItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_RED, SfxCallMode::RECORD, &aRedItem, 0L);
     return 0L;
 }
 
@@ -181,7 +181,7 @@ IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
 {
     const sal_Int16 nGreen = mpMtrGreen->GetValue();
     const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GREEN, SFX_CALLMODE_RECORD, &aGreenItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GREEN, SfxCallMode::RECORD, &aGreenItem, 0L);
     return 0L;
 }
 
@@ -191,7 +191,7 @@ IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
 {
     const sal_Int16 nBlue = mpMtrBlue->GetValue();
     const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_BLUE, SFX_CALLMODE_RECORD, &aBlueItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_BLUE, SfxCallMode::RECORD, &aBlueItem, 0L);
     return 0L;
 }
 
@@ -201,7 +201,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG)
 {
     const sal_Int32 nGamma = mpMtrGamma->GetValue();
     const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GAMMA, SFX_CALLMODE_RECORD, &nGammaItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GAMMA, SfxCallMode::RECORD, &nGammaItem, 0L);
     return 0L;
 }
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f948c4455ec8..334399a22223 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -703,14 +703,14 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl)
             // XLINE_NONE
             const XLineStyleItem aItem(XLINE_NONE);
 
-            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItem, 0L);
+            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &aItem, 0L);
         }
         else if(1 == nPos)
         {
             // XLINE_SOLID
             const XLineStyleItem aItem(XLINE_SOLID);
 
-            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItem, 0L);
+            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &aItem, 0L);
         }
         else if (mxLineStyleList.is() && mxLineStyleList->Count() > (long)(nPos - 2))
         {
@@ -722,8 +722,8 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl)
                 pDashEntry ? pDashEntry->GetName() : OUString(),
                 pDashEntry ? pDashEntry->GetDash() : XDash());
 
-            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L);
-            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aItemB, 0L);
+            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &aItemA, 0L);
+            GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SfxCallMode::RECORD, &aItemB, 0L);
         }
     }
 
@@ -742,7 +742,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
             pItem.reset(new XLineStartItem());
         else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) )
             pItem.reset(new XLineStartItem( mpLBStart->GetSelectEntry(),mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
-        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SFX_CALLMODE_RECORD, pItem.get(),  0L);
+        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SfxCallMode::RECORD, pItem.get(),  0L);
     }
     return 0;
 }
@@ -760,7 +760,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
             pItem.reset(new XLineEndItem());
         else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) )
             pItem.reset(new XLineEndItem( mpLBEnd->GetSelectEntry(), mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
-        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SFX_CALLMODE_RECORD, pItem.get(),  0L);
+        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SfxCallMode::RECORD, pItem.get(),  0L);
     }
     return 0;
 }
@@ -800,7 +800,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
             }
         }
 
-        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_JOINT, SFX_CALLMODE_RECORD, pItem.get(),  0L);
+        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_JOINT, SfxCallMode::RECORD, pItem.get(),  0L);
     }
     return 0;
 }
@@ -835,7 +835,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
             }
         }
 
-        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_CAP, SFX_CALLMODE_RECORD, pItem.get(),  0L);
+        GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_CAP, SfxCallMode::RECORD, pItem.get(),  0L);
     }
     return 0;
 }
@@ -861,7 +861,7 @@ IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG )
     sal_uInt16 nVal = (sal_uInt16)mpMFTransparent->GetValue();
     XLineTransparenceItem aItem( nVal );
 
-    GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &aItem, 0L);
     return( 0L );
 }
 
@@ -957,7 +957,7 @@ void LinePropertyPanel::SetColor (
     const Color aColor)
 {
     XLineColorItem aColorItem(rsColorName, aColor);
-    mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_COLOR, SFX_CALLMODE_RECORD, &aColorItem, 0L);
+    mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_COLOR, SfxCallMode::RECORD, &aColorItem, 0L);
     maColor = aColor;
 }
 
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index bbbd1df9b47e..97f518d3f2ac 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -274,7 +274,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
             sal_IntPtr nVal = LogicToLogic((sal_IntPtr)maVSWidth.GetItemData( iPos ) , MAP_POINT, (MapUnit)meMapUnit);
             nVal = maMFWidth.Denormalize(nVal);
             XLineWidthItem aWidthItem( nVal );
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SfxCallMode::RECORD, &aWidthItem, 0L);
             mrLinePropertyPanel.SetWidthIcon(iPos);
             mrLinePropertyPanel.SetWidth(nVal);
             mbCloseByEdit = false;
@@ -288,7 +288,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
                 long nVal = LogicToLogic(mnCustomWidth , MAP_POINT, (MapUnit)meMapUnit);
                 nVal = maMFWidth.Denormalize(nVal);
                 XLineWidthItem aWidthItem( nVal );
-                mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L);
+                mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SfxCallMode::RECORD, &aWidthItem, 0L);
                 mrLinePropertyPanel.SetWidth(nVal);
                 mbCloseByEdit = false;
                 mnTmpCustomWidth = 0;
@@ -326,7 +326,7 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
         long nVal = LogicToLogic( nTmp, MAP_POINT, (MapUnit)meMapUnit );
         sal_Int32 nNewWidth = (short)maMFWidth.Denormalize( nVal );
         XLineWidthItem aWidthItem(nNewWidth);
-        mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L);
+        mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SfxCallMode::RECORD, &aWidthItem, 0L);
 
         mbCloseByEdit = true;
         mnTmpCustomWidth = nTmp;
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
index d33d490a0c6b..b4407b8baa20 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
@@ -107,7 +107,7 @@ IMPL_LINK(ParaBulletsControl, BulletSelectHdl_Impl, ValueSet*, EMPTYARG)
     const sal_uInt16 nIdx = maBulletsVS.GetSelectItemId();
     SfxUInt16Item aItem( FN_SVX_SET_BULLET, nIdx );
     if (mpBindings)
-        mpBindings->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SFX_CALLMODE_RECORD, &aItem, 0L );
+        mpBindings->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SfxCallMode::RECORD, &aItem, 0L );
 
     mrParaPropertyPanel.EndBulletsPopupMode();
 
@@ -118,7 +118,7 @@ IMPL_LINK(ParaBulletsControl, BulletSelectHdl_Impl, ValueSet*, EMPTYARG)
 IMPL_LINK(ParaBulletsControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
 {
     if (mpBindings)
-        mpBindings->GetDispatcher()->Execute( SID_OUTLINE_BULLET, SFX_CALLMODE_ASYNCHRON );
+        mpBindings->GetDispatcher()->Execute( SID_OUTLINE_BULLET, SfxCallMode::ASYNCHRON );
 
     mrParaPropertyPanel.EndBulletsPopupMode();
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 2b64dd949919..36ba1e17163b 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -638,7 +638,7 @@ void ParaLineSpacingControl::ExecuteLineSpace()
     }
 
     mpBindings->GetDispatcher()->Execute(
-            SID_ATTR_PARA_LINESPACE, SFX_CALLMODE_RECORD, &aSpacing, 0L);
+            SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L);
 
     mbUseLineSPCustom = USE_CUSTOM;
 }
@@ -738,7 +738,7 @@ IMPL_LINK(ParaLineSpacingControl, VSSelHdl, void *, pControl)
                         }
 
                         mpBindings->GetDispatcher()->Execute(
-                            SID_ATTR_PARA_LINESPACE, SFX_CALLMODE_RECORD, &aSpacing, 0L);
+                            SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L);
 
                         ExecuteLineSpacing( USE_CUSTOM, 0 );
                     }
@@ -767,7 +767,7 @@ void ParaLineSpacingControl::ExecuteLineSpacing( bool aIsCustom, sal_uInt16 aEnt
             SetLineSpace( aSpacing, nPos );
 
         mpBindings->GetDispatcher()->Execute(
-            SID_ATTR_PARA_LINESPACE, SFX_CALLMODE_RECORD, &aSpacing, 0L);
+            SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L);
     }
 
     if( !aIsCustom )
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
index 86fe21f6cb38..119b7179c05f 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
@@ -106,7 +106,7 @@ IMPL_LINK(ParaNumberingControl, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
     const sal_uInt16 nIdx = maNumberVS.GetSelectItemId();
     SfxUInt16Item aItem( FN_SVX_SET_NUMBER, nIdx );
     if (mpBindings)
-        mpBindings->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SFX_CALLMODE_RECORD, &aItem, 0L );
+        mpBindings->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SfxCallMode::RECORD, &aItem, 0L );
 
     mrParaPropertyPanel.EndNumberingPopupMode();
 
@@ -117,7 +117,7 @@ IMPL_LINK(ParaNumberingControl, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
 IMPL_LINK(ParaNumberingControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
 {
     if (mpBindings)
-        mpBindings->GetDispatcher()->Execute( SID_OUTLINE_BULLET, SFX_CALLMODE_ASYNCHRON );
+        mpBindings->GetDispatcher()->Execute( SID_OUTLINE_BULLET, SfxCallMode::ASYNCHRON );
 
     mrParaPropertyPanel.EndNumberingPopupMode();
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index bb9994ea5c9c..97dca501671f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -391,7 +391,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
         nSID = FN_NUM_NUMBERING_ON;
     }
     SfxBoolItem aBoolItem(nSID, true);
-    GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
+    GetBindings()->GetDispatcher()->Execute(nSID, SfxCallMode::RECORD, &aBoolItem, 0L);
 
     return 0;
 }
@@ -433,7 +433,7 @@ void ParaPropertyPanel::SetBGColor (
     const Color aColor)
 {
     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);
     maColor = aColor;
 }
 
@@ -446,7 +446,7 @@ IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
     aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+        SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
     return 0;
 }
 
@@ -464,7 +464,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
                 {
                     SfxBoolItem aMargin( SID_INC_INDENT, true );
                     GetBindings()->GetDispatcher()->Execute(
-                        SID_INC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                        SID_INC_INDENT, SfxCallMode::RECORD, &aMargin, 0L);
                 }
                 break;
             default:
@@ -479,7 +479,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
                     aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
-                        SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                        SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
                 }
             }
         }
@@ -493,7 +493,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
                 {
                     SfxBoolItem aMargin( SID_DEC_INDENT, true );
                     GetBindings()->GetDispatcher()->Execute(
-                        SID_DEC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                        SID_DEC_INDENT, SfxCallMode::RECORD, &aMargin, 0L);
                 }
                 break;
             default:
@@ -513,7 +513,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
                     aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
 
                     GetBindings()->GetDispatcher()->Execute(
-                        SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                        SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
                 }
             }
         }
@@ -525,7 +525,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
             aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
             GetBindings()->GetDispatcher()->Execute(
-                SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
         }
 
     return( 0L );
@@ -537,11 +537,11 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
 
         if (aCommand == UNO_PROMOTE)
         {
-            GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SFX_CALLMODE_RECORD );
+            GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SfxCallMode::RECORD );
         }
         else if (aCommand == UNO_DEMOTE)
         {
-            GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SFX_CALLMODE_RECORD );
+            GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SfxCallMode::RECORD );
         }
         else if (aCommand == UNO_HANGINGINDENT2)
         {
@@ -550,7 +550,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
             aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
             aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
 
-            GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+            GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
         }
 
     return( 0L );
@@ -578,7 +578,7 @@ IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl)
     aMargin.SetLower( (sal_uInt16)GetCoreValue( *mpBottomDist, m_eULSpaceUnit ) );
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+        SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, &aMargin, 0L);
     return 0L;
 }
 
@@ -601,7 +601,7 @@ IMPL_LINK(ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl, ToolBox *, pControl)
                  aMargin.SetLower( (const sal_uInt16)nVal );
 
                  GetBindings()->GetDispatcher()->Execute(
-                     SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                     SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, &aMargin, 0L);
              }
              else if( aCommand == UNO_PARASPACEDEC)
              {
@@ -627,7 +627,7 @@ IMPL_LINK(ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl, ToolBox *, pControl)
                     aMargin.SetLower( DEFAULT_VALUE );
 
                  GetBindings()->GetDispatcher()->Execute(
-                     SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+                     SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, &aMargin, 0L);
              }
 
     return( 0L );
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 2e1346de8355..8e41e48b03df 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -514,7 +514,7 @@ IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
     SfxInt32Item aRotYItem( SID_ATTR_TRANSFORM_ROT_Y, basegfx::fround(mlRotY * fUIScale));
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
+        SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
 
     return 0;
 }
@@ -532,7 +532,7 @@ IMPL_LINK( PosSizePropertyPanel, RotationHdl, void *, EMPTYARG )
     SfxInt32Item aRotYItem( SID_ATTR_TRANSFORM_ROT_Y, basegfx::fround(mlRotY * fUIScale));
 
     GetBindings()->GetDispatcher()->Execute(
-        SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
+        SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
 
     return 0;
 }
@@ -547,13 +547,13 @@ IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox )
     {
         SfxVoidItem aHoriItem(SID_FLIP_HORIZONTAL);
         GetBindings()->GetDispatcher()->Execute(
-                SID_FLIP_HORIZONTAL, SFX_CALLMODE_RECORD, &aHoriItem, 0L );
+                SID_FLIP_HORIZONTAL, SfxCallMode::RECORD, &aHoriItem, 0L );
     }
     else if(aCommand == UNO_FLIPVERTICAL)
     {
         SfxVoidItem aVertItem(SID_FLIP_VERTICAL);
         GetBindings()->GetDispatcher()->Execute(
-                SID_FLIP_VERTICAL, SFX_CALLMODE_RECORD, &aVertItem, 0L );
+                SID_FLIP_VERTICAL, SfxCallMode::RECORD, &aVertItem, 0L );
     }
 
     return 0;
@@ -924,16 +924,16 @@ void PosSizePropertyPanel::executeSize()
             || nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_OLE)
             )
         {
-            GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
+            GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
         }
         else
         {
             if ( (mpMtrWidth->IsValueModified()) && (mpMtrHeight->IsValueModified()))
-                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
+                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
             else if( mpMtrWidth->IsValueModified())
-                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aWidthItem, &aPointItem, 0L );
+                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aPointItem, 0L );
             else if ( mpMtrHeight->IsValueModified())
-                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aHeightItem, &aPointItem, 0L );
+                GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aHeightItem, &aPointItem, 0L );
         }
     }
 }
@@ -963,7 +963,7 @@ void PosSizePropertyPanel::executePosX()
         SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
 
         GetBindings()->GetDispatcher()->Execute(
-            SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aPosXItem, 0L );
+            SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aPosXItem, 0L );
     }
 }
 
@@ -990,7 +990,7 @@ void PosSizePropertyPanel::executePosY()
         SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
 
         GetBindings()->GetDispatcher()->Execute(
-            SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aPosYItem, 0L );
+            SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aPosYItem, 0L );
     }
 }
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 0d45f75f027d..3a798f22fece 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -305,7 +305,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
             nVal = LogicToLogic(30, MAP_POINT, (MapUnit)eUnit);
             nKern = (short)maEditKerning.Denormalize(nVal);
             SvxKerningItem aKernItem(-nKern, SID_ATTR_CHAR_KERNING);
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
             mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
         }
         else if(iPos == 2)
@@ -313,13 +313,13 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
             nVal = LogicToLogic(15, MAP_POINT, (MapUnit)eUnit);
             nKern = (short)maEditKerning.Denormalize(nVal);
             SvxKerningItem aKernItem(-nKern, SID_ATTR_CHAR_KERNING);
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
             mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
         }
         else if(iPos == 3)
         {
             SvxKerningItem aKernItem(0, SID_ATTR_CHAR_KERNING);
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
             mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
         }
         else if(iPos == 4)
@@ -327,7 +327,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
             nVal = LogicToLogic(30, MAP_POINT, (MapUnit)eUnit);
             nKern = (short)maEditKerning.Denormalize(nVal);
             SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
             mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
         }
         else if(iPos == 5)
@@ -335,7 +335,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
             nVal = LogicToLogic(60, MAP_POINT, (MapUnit)eUnit);
             nKern = (short)maEditKerning.Denormalize(nVal);
             SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
-            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+            mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
             mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
         }
         else if(iPos == 6)
@@ -346,7 +346,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
                 nVal = LogicToLogic(mnCustomKern, MAP_POINT, (MapUnit)eUnit);
                 nKern = (short)maEditKerning.Denormalize(nVal);
                 SvxKerningItem aKernItem(nKern , SID_ATTR_CHAR_KERNING);
-                mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+                mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
                 mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
             }
             else
@@ -438,7 +438,7 @@ IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*, EMPTYARG)
         mnCustomKern = 0;
     }
     SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
-    mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SFX_CALLMODE_RECORD, &aKernItem, 0L);
+    mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
     return 0;
 }
 
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 0d393e968735..cc62e5b5e74b 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -212,7 +212,7 @@ IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
         SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
 
         aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
-        mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
+        mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SfxCallMode::RECORD, &aLineItem, 0L);
         mrTextPropertyPanel.EndUnderlinePopupMode();
     }
     return( 0L );
@@ -225,7 +225,7 @@ IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn)
         if (mpBindings)
         {
             SfxDispatcher* pDisp = mpBindings->GetDispatcher();
-            pDisp->Execute( SID_CHAR_DLG_EFFECT, SFX_CALLMODE_ASYNCHRON );
+            pDisp->Execute( SID_CHAR_DLG_EFFECT, SfxCallMode::ASYNCHRON );
         }
         mrTextPropertyPanel.EndUnderlinePopupMode();
     }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 47502c02b9c3..f99dc07411e1 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -333,7 +333,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
                 aArgs[0].Value = a;
 
                 execute( OUString( ".uno:StatusBarFunc" ), aArgs );
-//              GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
+//              GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SfxCallMode::RECORD, &aItem, 0L );
             }
         }
     }
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 9ceb3d8fb738..6a19284d9166 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -329,7 +329,7 @@ bool SvxColorDockingWindow::Close()
 {
     SfxBoolItem aItem( SID_COLOR_CONTROL, false );
     GetBindings().GetDispatcher()->Execute(
-        SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+        SID_COLOR_CONTROL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
     SfxDockingWindow::Close();
     return true;
 }
@@ -348,7 +348,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
             if ( nPos == 1 )        // unsichtbar
             {
                 XFillStyleItem aXFillStyleItem( drawing::FillStyle_NONE );
-                pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L );
+                pDispatcher->Execute( nLeftSlot, SfxCallMode::RECORD, &aXFillStyleItem, 0L );
             }
             else
             {
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
                     {
                         SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR );
                         pDispatcher->Execute(
-                            SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L );
+                            SID_ATTR_CHAR_COLOR, SfxCallMode::RECORD, &aTextColorItem, 0L );
                         bDone = true;
                     }
                 }
@@ -373,14 +373,14 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
                     XFillStyleItem aXFillStyleItem( drawing::FillStyle_SOLID );
                     XFillColorItem aXFillColorItem( aStr, aColor );
                     pDispatcher->Execute(
-                        nLeftSlot, SFX_CALLMODE_RECORD, &aXFillColorItem, &aXFillStyleItem, 0L );
+                        nLeftSlot, SfxCallMode::RECORD, &aXFillColorItem, &aXFillStyleItem, 0L );
                 }
             }
         }
         else if ( nPos != 1 )       // unsichtbar
         {
             SvxColorItem aLeftColorItem( aColor, nLeftSlot );
-            pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aLeftColorItem, 0L );
+            pDispatcher->Execute( nLeftSlot, SfxCallMode::RECORD, &aLeftColorItem, 0L );
         }
     }
     else
@@ -390,7 +390,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
             if( nPos == 1 )     // unsichtbar
             {
                 XLineStyleItem aXLineStyleItem( XLINE_NONE );
-                pDispatcher->Execute( nRightSlot, SFX_CALLMODE_RECORD, &aXLineStyleItem, 0L );
+                pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineStyleItem, 0L );
             }
             else
             {
@@ -410,20 +410,20 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl)
                             if ( eXLS == XLINE_NONE )
                             {
                                 XLineStyleItem aXLineStyleItem( XLINE_SOLID );
-                                pDispatcher->Execute( nRightSlot, SFX_CALLMODE_RECORD, &aXLineStyleItem, 0L );
+                                pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineStyleItem, 0L );
                             }
                         }
                     }
                 }
 
                 XLineColorItem aXLineColorItem( aStr, aColor );
-                pDispatcher->Execute( nRightSlot, SFX_CALLMODE_RECORD, &aXLineColorItem, 0L );
+                pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineColorItem, 0L );
             }
         }
         else if ( nPos != 1 )       // unsichtbar
         {
             SvxColorItem aRightColorItem( aColor, nRightSlot );
-            pDispatcher->Execute( nRightSlot, SFX_CALLMODE_RECORD, &aRightColorItem, 0L );
+            pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aRightColorItem, 0L );
         }
     }
 
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index f5c4aed0844f..598fc3a94c33 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -509,7 +509,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
     }
 
     // The medium isn't locked after reopening the document.
-    SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() );
+    SfxRequest aReq( SID_SAVEASDOC, SfxCallMode::SYNCHRON, GetAttrPool() );
     aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) );
     aReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) );
     if(pFilter)
diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx
index a888cfef3a45..f0fbebcaf046 100644
--- a/sw/source/ui/dbui/mmmergepage.cxx
+++ b/sw/source/ui/dbui/mmmergepage.cxx
@@ -73,7 +73,7 @@ IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl)
     if(pTargetView)
     {
         pTargetView->GetViewFrame()->GetDispatcher()->Execute(
-            FID_SEARCH_NOW, SFX_CALLMODE_SYNCHRON, &aSearchItem, &aQuiet, 0L );
+            FID_SEARCH_NOW, SfxCallMode::SYNCHRON, &aSearchItem, &aQuiet, 0L );
     }
 
     return 0;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 369d41f4197c..a164ad9640af 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -518,7 +518,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
         uno::Reference< frame::XFrame > xFrame =
                 pSourceViewFrm->GetFrame().GetFrameInterface();
         xFrame->getContainerWindow()->setVisible(sal_True);
-        pSourceViewFrm->GetDispatcher()->Execute(SID_SAVEDOC, SFX_CALLMODE_SYNCHRON);
+        pSourceViewFrm->GetDispatcher()->Execute(SID_SAVEDOC, SfxCallMode::SYNCHRON);
         xFrame->getContainerWindow()->setVisible(sal_False);
         SwDocShell* pDocShell = pSourceView->GetDocShell();
         //if the document has been saved its URL has to be stored for
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 11b528b4f1f5..1ed05cd896cf 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -108,7 +108,7 @@ bool SwFldDlg::Close()
 {
     m_pBindings->GetDispatcher()->
         Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD,
-        SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+        SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
     return true;
 }
 
@@ -208,7 +208,7 @@ void SwFldDlg::ReInitDlg()
     if (bNewMode != m_bHtmlMode)
     {
         SfxViewFrame::Current()->GetDispatcher()->
-            Execute(FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+            Execute(FN_INSERT_FIELD, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
         Close();
     }
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index b1d201e7e265..f80a72107061 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl)
         //only if there actually are columns!
         if(rColItem.GetNumCols() > 1)
             rWrtShell.GetView().GetViewFrame()->GetDispatcher()->Execute(
-                FN_INSERT_REGION, SFX_CALLMODE_ASYNCHRON, *pSelectionSet );
+                FN_INSERT_REGION, SfxCallMode::ASYNCHRON, *pSelectionSet );
     }
 
     if(pSectionSet && pSectionSet->Count() && bSectionChanged )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4b8cff892862..2ebdcee14dcd 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2092,7 +2092,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
         Application::SetDefDialogParent( pBtn );
         ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell().
         GetView().GetViewFrame()->GetDispatcher()->Execute(
-        SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL,
+        SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
             &aStyle, &aFamily, 0L);
         Application::SetDefDialogParent( pDefDlgParent );
     }
@@ -3607,7 +3607,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
         Application::SetDefDialogParent( pBtn );
         SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
         rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(
-        SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL,
+        SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
             &aStyle, &aFamily, 0L);
         Application::SetDefDialogParent( pDefDlgParent );
     }
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 8cf9a0fef693..085ca163820f 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -614,7 +614,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl)
     {
         sal_uInt16 nSlot = FN_INSERT_IDX_ENTRY_DLG;
         SfxViewFrame::Current()->GetDispatcher()->Execute(nSlot,
-                    SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+                    SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
     }
     else
     {
@@ -1116,7 +1116,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl)
     {
         sal_uInt16 nSlot = FN_INSERT_AUTH_ENTRY_DLG;
         SfxViewFrame::Current()->GetDispatcher()->Execute(nSlot,
-                    SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+                    SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
     }
     else
     {
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 3a96259ee8df..8556b97e010e 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -203,7 +203,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL)
         SfxBoolItem aHidden( SID_HIDDEN, true );
         SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle());
         SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()->
-                Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
+                Execute(SID_OPENDOC, SfxCallMode::SYNCHRON,
                             &aURL, &aHidden, &aReferer, &aTargetFrameName, 0L);
         SfxShell* pShell = pItem ? pItem->GetShell() : 0;
 
@@ -229,7 +229,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL)
         SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName());
         const SfxFrameItem* pItem = (SfxFrameItem*)
                             pView->GetViewFrame()->GetDispatcher()->Execute(SID_NEWDOCDIRECT,
-                                SFX_CALLMODE_SYNCHRON, &aFactory, 0L);
+                                SfxCallMode::SYNCHRON, &aFactory, 0L);
         SfxFrame* pFrm = pItem ? pItem->GetFrame() : 0;
         SfxViewFrame* pFrame = pFrm ? pFrm->GetCurrentViewFrame() : 0;
         pNewView = pFrame ? PTR_CAST(SwView, pFrame->GetViewShell()) : 0;
@@ -468,7 +468,7 @@ IMPL_LINK( SwMailMergeWizardExecutor, EndDialogHdl, AbstractMailMergeWizard*, pD
             pTempView->SetMailMergeConfigItem(m_pMMConfig, m_pWizard->GetRestartPage(), !bResult);
             SfxViewFrame* pViewFrame = pTempView->GetViewFrame();
             pViewFrame->GetDispatcher()->Execute(
-                FN_MAILMERGE_CHILDWINDOW, SFX_CALLMODE_SYNCHRON);
+                FN_MAILMERGE_CHILDWINDOW, SfxCallMode::SYNCHRON);
             ExecutionFinished( false );
             break;
         }
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 867766228951..99ec89bccd8f 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -402,7 +402,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
         {
             SfxDispatcher* pDisp = pViewFrame->GetDispatcher();
             assert(pDisp && "No dispatcher in frame?");
-            pDisp->Execute(FN_SYNC_LABELS, SFX_CALLMODE_ASYNCHRON);
+            pDisp->Execute(FN_SYNC_LABELS, SfxCallMode::ASYNCHRON);
         }
         rReq.SetReturnValue(SfxVoidItem(bLabel ? FN_LABEL : FN_BUSINESS_CARD));
     }
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index f4a4e9fb87c0..8117908fa512 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -352,7 +352,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
             pAFlags->m_pAutoCompleteList = &aTmpLst;
 
             SfxApplication* pApp = SfxGetpApp();
-            SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool());
+            SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SfxCallMode::SYNCHRON, pApp->GetPool());
             SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, true );
             aAppReq.AppendItem(aSwOptions);
 
@@ -450,7 +450,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         pTmpFrm = SfxViewFrame::GetFirst( this );
 
                     if (pTmpFrm)
-                        pTmpFrm->GetDispatcher()->Execute( nSlotId, 0, 0, SFX_CALLMODE_ASYNCHRON );
+                        pTmpFrm->GetDispatcher()->Execute( nSlotId, SfxCallMode::ASYNCHRON );
                 }
 
                 rReq.SetReturnValue(SfxBoolItem(SID_PRINTPREVIEW, bSet ));
@@ -622,7 +622,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         SfxStringItem aFilter(SID_FILTER_NAME, pHtmlFlt->GetName());
                         const SfxBoolItem* pBool = (const SfxBoolItem*)
                                 pViewFrm->GetDispatcher()->Execute(
-                                        SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, &aName, &aFilter, 0L );
+                                        SID_SAVEASDOC, SfxCallMode::SYNCHRON, &aName, &aFilter, 0L );
                         if(!pBool || !pBool->GetValue())
                             break;
                     }
@@ -661,7 +661,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     }
                 }
                 if(nSlot)
-                    pViewFrm->GetDispatcher()->Execute(nSlot, SFX_CALLMODE_SYNCHRON);
+                    pViewFrm->GetDispatcher()->Execute(nSlot, SfxCallMode::SYNCHRON);
                 if(bSetModified)
                     GetDoc()->getIDocumentState().SetModified();
                 if(pSavePrinter)
@@ -1071,7 +1071,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                     SfxDispatcher* pDispatch = pViewShell->GetDispatcher();
                                     pDispatch->Execute(
                                             SID_OPENDOC,
-                                            SFX_CALLMODE_ASYNCHRON,
+                                            SfxCallMode::ASYNCHRON,
                                             &aName,
                                             &aReferer,
                                             pFrameItem.get(), 0L );
@@ -1129,7 +1129,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
             SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.text.TextDocument"));
             SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
             pViewShell->GetDispatcher()->Execute(
-                SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L);
+                SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aApp, &aTarget, 0L);
         }
         break;
 
@@ -1314,7 +1314,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
                     SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
                     pSrcView->GetViewFrame()->GetDispatcher()->Execute(
                                             SID_BASICIDE_LIBREMOVED,
-                                            SFX_CALLMODE_SYNCHRON,
+                                            SfxCallMode::SYNCHRON,
                                             &aShellItem, &aLibNameItem, 0L );
 
                     // Only the modules are deleted from the standard-lib
@@ -1352,7 +1352,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
     SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView()
                                          : SfxViewShell::Current();
     SfxViewFrame*  pViewFrm = pViewShell->GetViewFrame();
-    pViewFrm->GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON );
+    pViewFrm->GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON );
 
     SubInitNew();
 
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index d99b68e36087..b8413cd0da12 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -304,7 +304,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
         case SID_STYLE_APPLY:
             if( !pArgs )
             {
-                GetView()->GetViewFrame()->GetDispatcher()->Execute(SID_STYLE_DESIGNER, sal_False);
+                GetView()->GetViewFrame()->GetDispatcher()->Execute(SID_STYLE_DESIGNER);
                 break;
             }
             else
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 4d504180d832..e6475255ba04 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -864,7 +864,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
         }
 
         if( !bMergeShell && pSourceDocSh->IsModified() )
-            pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD);
+            pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SfxCallMode::SYNCHRON|SfxCallMode::RECORD);
         if( bMergeShell || !pSourceDocSh->IsModified() )
         {
             const SfxFilter* pStoreToFilter = SwIoSystem::GetFileFilter(
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index caaec215a799..6fe21b8c2148 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -75,7 +75,7 @@ SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,
 
 IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
 {
-    GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SFX_CALLMODE_ASYNCHRON);
+    GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SfxCallMode::ASYNCHRON);
     return 0;
 }
 
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 89f25f74206e..8d9a3201cf95 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -428,7 +428,7 @@ The code below would only be part of the solution.
             }
 
             // close the spelling dialog
-            GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON);
+            GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON);
         }
     }
     return aRet;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 5e72c8c877ca..fe1c4ed9ea42 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2555,7 +2555,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
             {
                 const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aMediaURLStr );
                 rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(
-                                SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON,
+                                SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON,
                                 &aMediaURLItem, 0L );
             }
 #else
@@ -2697,7 +2697,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
 
             SfxStringItem aDataDesc( nWh, sTxt );
             rView.GetViewFrame()->GetDispatcher()->Execute(
-                                nWh, SFX_CALLMODE_ASYNCHRON, &aDataDesc,
+                                nWh, SfxCallMode::ASYNCHRON, &aDataDesc,
                                 pConnectionItem.get(), pColumnItem.get(),
                                 pSourceItem.get(), pCommandItem.get(), pCommandTypeItem.get(),
                                 pColumnNameItem.get(), pSelectionItem.get(), pCursorItem.get(), 0L);
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 8f472f48add1..c8b85747da61 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -237,7 +237,7 @@ void SwPageBreakWin::Select( )
 
                         SfxStringItem aItem(pEditWin->GetView().GetPool().GetWhich(FN_FORMAT_TABLE_DLG), "textflow");
                         pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute(
-                                FN_FORMAT_TABLE_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, NULL );
+                                FN_FORMAT_TABLE_DLG, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aItem, NULL );
 
                         rSh.Pop( false );
                     }
@@ -250,7 +250,7 @@ void SwPageBreakWin::Select( )
                         SwPaMItem aPaMItem( pEditWin->GetView().GetPool( ).GetWhich( FN_PARAM_PAM ), &aPaM );
                         SfxStringItem aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), "textflow" );
                         pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute(
-                                SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, &aPaMItem, NULL );
+                                SID_PARA_DLG, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aItem, &aPaMItem, NULL );
                     }
                     rSh.LockView( bOldLock );
                     pEditWin->GrabFocus( );
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index f6cba0bb8298..360590604d1a 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -323,7 +323,7 @@ IMPL_LINK( SidebarTxtControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo )
 {
     if ( pInfo->nCommand == SPELLCMD_STARTSPELLDLG )
     {
-        mrDocView.GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON);
+        mrDocView.GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON);
     }
     return 0;
 }
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index ba4c47437f42..e97589c76384 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -1076,7 +1076,7 @@ void SwSidebarWin::ExecuteCommand(sal_uInt16 nSlot)
         case FN_DELETE_ALL_NOTES:
         case FN_HIDE_ALL_NOTES:
             // not possible as slot as this would require that "this" is the active postit
-            mrView.GetViewFrame()->GetBindings().Execute( nSlot, 0, 0, SFX_CALLMODE_ASYNCHRON );
+            mrView.GetViewFrame()->GetBindings().Execute( nSlot, 0, 0, SfxCallMode::ASYNCHRON );
             break;
         case FN_DELETE_NOTE_AUTHOR:
         case FN_HIDE_NOTE_AUTHOR:
@@ -1086,7 +1086,7 @@ void SwSidebarWin::ExecuteCommand(sal_uInt16 nSlot)
             const SfxPoolItem* aItems[2];
             aItems[0] = &aItem;
             aItems[1] = 0;
-            mrView.GetViewFrame()->GetBindings().Execute( nSlot, aItems, 0, SFX_CALLMODE_ASYNCHRON );
+            mrView.GetViewFrame()->GetBindings().Execute( nSlot, aItems, 0, SfxCallMode::ASYNCHRON );
         }
             break;
         default:
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index dcc3b9df8960..f95e7f69a862 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3327,7 +3327,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                 RstMBDownFlags();
                                 GetView().GetViewFrame()->GetBindings().Execute(
                                     FN_FORMAT_GRAFIC_DLG, 0, 0,
-                                    SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT);
+                                    SfxCallMode::RECORD|SfxCallMode::SLOT);
                                 return;
 
                             // double click on OLE object --> OLE-InPlace
@@ -3342,7 +3342,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             case nsSelectionType::SEL_FRM:
                                 RstMBDownFlags();
                                 GetView().GetViewFrame()->GetBindings().Execute(
-                                    FN_FORMAT_FRAME_DLG, 0, 0, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT);
+                                    FN_FORMAT_FRAME_DLG, 0, 0, SfxCallMode::RECORD|SfxCallMode::SLOT);
                                 return;
 
                             case nsSelectionType::SEL_DRW:
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 81a59be3ec6f..676f41d4c364 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -70,7 +70,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings,
 
 IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl)
 {
-    SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SFX_CALLMODE_ASYNCHRON);
+    SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON);
     return 0;
 }
 
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 160fb15395bd..def26f114f9d 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1266,7 +1266,7 @@ bool SwFldMgr::InsertFld(
                 {
                     SfxStringItem aFormat(FN_NUMBER_FORMAT, pEntry->GetFormatstring());
                     pCurShell->GetView().GetViewFrame()->GetDispatcher()->
-                        Execute(FN_NUMBER_FORMAT, SFX_CALLMODE_SYNCHRON, &aFormat, 0L);
+                        Execute(FN_NUMBER_FORMAT, SfxCallMode::SYNCHRON, &aFormat, 0L);
                 }
 
                 SfxItemSet aBoxSet( pCurShell->GetAttrPool(),
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index b041797d4e81..ce080774ed7a 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -718,7 +718,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             uno::Reference<linguistic2::XSearchableDictionaryList> xDictionaryList( SvxGetDictionaryList() );
             SvxDicListChgClamp aClamp( xDictionaryList );
             m_pSh->GetView().GetViewFrame()->GetDispatcher()->
-                Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON );
+                Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON );
         }
     }
     else if (nId == MN_IGNORE_SELECTION)
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index ae71c2c8bfd2..fc993a8c32eb 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -111,7 +111,7 @@ void SwModelessRedlineAcceptDlg::Activate()
         bool bMod = pSh->IsModified();
         SfxBoolItem aShow(FN_REDLINE_SHOW, true);
         pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(
-            FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L);
+            FN_REDLINE_SHOW, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aShow, 0L);
         if (!bMod)
             pSh->ResetModified();
         pImplDlg->Init();
@@ -878,7 +878,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl)
 {
     SwView * pView = ::GetActiveView();
     pView->GetViewFrame()->GetDispatcher()->
-                Execute(SID_UNDO, SFX_CALLMODE_SYNCHRON);
+                Execute(SID_UNDO, SfxCallMode::SYNCHRON);
     pTPView->EnableUndo(pView->GetSlotState(SID_UNDO) != 0);
 
     Activate();
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 015e0d7231c8..99db68c4c546 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -386,7 +386,7 @@ void  SwInputWindow::ApplyFormula()
     const SfxPoolItem* aArgs[2];
     aArgs[0] = &aParam;
     aArgs[1] = 0;
-    pView->GetViewFrame()->GetBindings().Execute( FN_EDIT_FORMULA, aArgs, 0, SFX_CALLMODE_ASYNCHRON );
+    pView->GetViewFrame()->GetBindings().Execute( FN_EDIT_FORMULA, aArgs, 0, SfxCallMode::ASYNCHRON );
 }
 
 void  SwInputWindow::CancelFormula()
@@ -405,7 +405,7 @@ void  SwInputWindow::CancelFormula()
 
         pView->GetEditWin().GrabFocus();
 
-        pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SFX_CALLMODE_ASYNCHRON);
+        pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SfxCallMode::ASYNCHRON);
     }
 }
 
diff --git a/sw/source/uibase/ribbar/tbxanchr.cxx b/sw/source/uibase/ribbar/tbxanchr.cxx
index 1a2d9661d6b2..a251877da573 100644
--- a/sw/source/uibase/ribbar/tbxanchr.cxx
+++ b/sw/source/uibase/ribbar/tbxanchr.cxx
@@ -118,7 +118,7 @@ void  SwTbxAnchor::Click()
     GetToolBox().EndSelection();
 
     if (nSlotId)
-        pDispatch->Execute(nSlotId, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
+        pDispatch->Execute(nSlotId, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 2206bf5bc507..96f521831bb5 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -723,7 +723,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 nGalleryItemType == com::sun::star::gallery::GalleryItemType::MEDIA  )
             {
                 const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() );
-                GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
+                GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L );
             }
         }
         break;
@@ -755,7 +755,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 rSh.ChgPageDesc(nCurIdx, aPageDesc);
             }
             else
-                GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_COLUMN_DLG, sal_False);
+                GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_COLUMN_DLG);
         }
         break;
         case FN_CONVERT_TABLE_TO_TEXT:
@@ -2040,7 +2040,7 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq )
         }
     }
     else
-        GetView().GetViewFrame()->GetDispatcher()->Execute( SID_CHAR_DLG, sal_False);
+        GetView().GetViewFrame()->GetDispatcher()->Execute( SID_CHAR_DLG );
     rReq.Done();
 }
 
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 04e2e13ac28a..7ba6f6d2bba2 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -86,7 +86,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
             if (pSh->IsObjSelected())
             {
                 if (pSdrView->HasMarkedPoints())
-                    pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_DELETE, sal_False);
+                    pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_DELETE);
                 else
                 {
                     pSh->DelSelectedObj();
diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx
index 468911748c79..548085786df0 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -193,7 +193,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
             case SID_ATTR_FILL_BITMAP:
             case SID_ATTR_FILL_TRANSPARENCE:
             case SID_ATTR_FILL_FLOATTRANSPARENCE:
-                pDis->Execute(SID_ATTRIBUTES_AREA, sal_False);
+                pDis->Execute(SID_ATTRIBUTES_AREA);
                 break;
             case SID_ATTR_LINE_STYLE:
             case SID_ATTR_LINE_DASH:
@@ -202,7 +202,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
             case SID_ATTR_LINE_TRANSPARENCE:
             case SID_ATTR_LINE_JOINT:
             case SID_ATTR_LINE_CAP:
-                pDis->Execute(SID_ATTRIBUTES_LINE, sal_False);
+                pDis->Execute(SID_ATTRIBUTES_LINE);
                 break;
         }
     }
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index f3ad3e3762b6..68eb28e6f7f9 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -96,11 +96,11 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
                     {
                         //remove object -> results in destruction of this!
                         SwView& rTempView = GetView();
-                        rTempView.GetViewFrame()->GetDispatcher()->Execute(SID_DELETE, SFX_CALLMODE_SYNCHRON );
+                        rTempView.GetViewFrame()->GetDispatcher()->Execute(SID_DELETE, SfxCallMode::SYNCHRON );
                         rTempView.StopShellTimer();
                         //issue a new command to insert the link
                         rTempView.GetViewFrame()->GetDispatcher()->Execute(
-                                SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0);
+                                SID_HYPERLINK_SETLINK, SfxCallMode::ASYNCHRON, &rHLinkItem, 0);
                     }
                     else
                     {
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index d501908e2218..51d226e6d134 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -156,7 +156,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 // Frame already exists, open frame dialog for editing.
                 SfxStringItem aDefPage(FN_FORMAT_FRAME_DLG, "columns");
                 rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_FORMAT_FRAME_DLG,
-                                SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+                                SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
                                 &aDefPage, 0L );
 
             }
@@ -1262,7 +1262,7 @@ void SwFrameShell::ExecDrawAttrArgsTextFrame(SfxRequest& rReq)
             case SID_ATTR_FILL_TRANSPARENCE:
             case SID_ATTR_FILL_FLOATTRANSPARENCE:
             {
-                pDis->Execute(SID_ATTRIBUTES_AREA, sal_False);
+                pDis->Execute(SID_ATTRIBUTES_AREA);
                 break;
             }
         }
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 1cdd584b1d6b..36078056ed17 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -178,7 +178,7 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     {
         rSh.StartAllAction();
         rSh.Push();
-        rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_TABLE_SELECT_ALL, sal_False );
+        rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_TABLE_SELECT_ALL );
     }
     SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
 
@@ -894,7 +894,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                     SfxBoolItem  aAfter( FN_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() );
                     SfxViewFrame* pVFrame = GetView().GetViewFrame();
                     if( pVFrame )
-                        pVFrame->GetDispatcher()->Execute( nDispatchSlot, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aCountItem, &aAfter, 0L);
+                        pVFrame->GetDispatcher()->Execute( nDispatchSlot, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aCountItem, &aAfter, 0L);
                 }
             }
             break;
@@ -1017,7 +1017,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_AUTOSUM:
         {
             SfxViewFrame* pVFrame = GetView().GetViewFrame();
-            pVFrame->GetDispatcher()->Execute(FN_EDIT_FORMULA, SFX_CALLMODE_SYNCHRON);
+            pVFrame->GetDispatcher()->Execute(FN_EDIT_FORMULA, SfxCallMode::SYNCHRON);
             const sal_uInt16 nId = SwInputChild::GetChildWindowId();
             SwInputChild* pChildWin = (SwInputChild*)pVFrame->
                                                 GetChildWindow( nId );
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 024c15c10f87..5dfef0497004 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1255,7 +1255,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case SID_RUBY_DIALOG:
         case SID_HYPERLINK_DIALOG:
         {
-            SfxRequest aReq(nSlot, SFX_CALLMODE_SLOT, SfxGetpApp()->GetPool());
+            SfxRequest aReq(nSlot, SfxCallMode::SLOT, SfxGetpApp()->GetPool());
             GetView().GetViewFrame()->ExecuteSlot( aReq);
             rReq.Ignore();
         }
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 2748f65f45de..eaec7905f221 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -99,7 +99,7 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
 
 IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
 {
-    mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SFX_CALLMODE_ASYNCHRON );
+    mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON );
 
     mrPagePropPanel.ClosePageColumnPopup();
     return 0;
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index fcc9d4523ed5..e1aae308b905 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -292,7 +292,7 @@ void PagePropertyPanel::ExecuteOrientationChange( const bool bLandscape )
         mpPageSizeItem->SetSize(Size(nRotatedWidth, nRotatedHeight));
 
         // apply changed attributes
-        GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), mpPageItem.get(), 0L );
+        GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, mpPageSizeItem.get(), mpPageItem.get(), 0L );
     }
 
     // check, if margin values still fit to the changed page size.
@@ -363,7 +363,7 @@ void PagePropertyPanel::ExecuteMarginLRChange(
 {
     mpPageLRMarginItem->SetLeft( nPageLeftMargin );
     mpPageLRMarginItem->SetRight( nPageRightMargin );
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_LRSPACE, SFX_CALLMODE_RECORD, mpPageLRMarginItem.get(),  0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_LRSPACE, SfxCallMode::RECORD, mpPageLRMarginItem.get(),  0L );
 }
 
 void PagePropertyPanel::ExecuteMarginULChange(
@@ -372,13 +372,13 @@ void PagePropertyPanel::ExecuteMarginULChange(
 {
     mpPageULMarginItem->SetUpper( nPageTopMargin );
     mpPageULMarginItem->SetLower( nPageBottomMargin );
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SFX_CALLMODE_RECORD, mpPageULMarginItem.get(),  0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SfxCallMode::RECORD, mpPageULMarginItem.get(),  0L );
 }
 
 void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored )
 {
     mpPageItem->SetPageUsage( bMirrored ? SVX_PAGE_MIRROR : SVX_PAGE_ALL );
-    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SFX_CALLMODE_RECORD, mpPageItem.get(),  0L );
+    GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SfxCallMode::RECORD, mpPageItem.get(),  0L );
 }
 
 IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox )
@@ -412,7 +412,7 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper )
     }
     mpPageSizeItem->SetSize( aPageSize );
 
-    mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(),  0L );
+    mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, mpPageSizeItem.get(),  0L );
 }
 
 IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox )
@@ -439,7 +439,7 @@ void PagePropertyPanel::ClosePageSizePopup()
 void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType )
 {
     mpPageColumnTypeItem->SetValue( nColumnType );
-    mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SFX_CALLMODE_RECORD, mpPageColumnTypeItem.get(),  0L );
+    mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SfxCallMode::RECORD, mpPageColumnTypeItem.get(),  0L );
 }
 
 IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox )
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 31d6eaba3bb0..84c8db420239 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -166,7 +166,7 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
 
 IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG)
 {
-    mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SFX_CALLMODE_ASYNCHRON );
+    mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON );
 
     mrPagePropPanel.ClosePageSizePopup();
     return 0;
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 76b9a79dd38b..ed85a1007e29 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -172,7 +172,7 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG)
         nSlot = FN_FRAME_NOWRAP;
     }
     SfxBoolItem bStateItem( nSlot, true );
-    mpBindings->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_RECORD, &bStateItem, 0L );
+    mpBindings->GetDispatcher()->Execute( nSlot, SfxCallMode::RECORD, &bStateItem, 0L );
 
     return 0;
 }
diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx
index 1e059856e891..aff345e6ec42 100644
--- a/sw/source/uibase/smartmenu/stmenu.cxx
+++ b/sw/source/uibase/smartmenu/stmenu.cxx
@@ -134,7 +134,7 @@ sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWi
     if ( nId == MN_SMARTTAG_OPTIONS )
     {
         SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, true);
-        mpSwView->GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
+        mpSwView->GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L );
     }
 
     if ( nId < MN_ST_INSERT_START) return nId;
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 6370f6085490..68d521d789cd 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -150,7 +150,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
         {
             // select whole table
             rWrtShell.GetView().GetViewFrame()->GetDispatcher()->
-                Execute(FN_TABLE_SELECT_ALL, SFX_CALLMODE_SYNCHRON);
+                Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON);
         }
         if( ! rWrtShell.IsTblComplexForChart())
         {
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 1f7c255acb94..912be1e4cedf 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -432,7 +432,7 @@ void  SwPagePreviewWin::KeyInput( const KeyEvent &rKEvt )
         {
             bHandled = true;
             mrView.GetViewFrame()->GetDispatcher()->Execute(
-                                nSlot, SFX_CALLMODE_ASYNCHRON );
+                                nSlot, SfxCallMode::ASYNCHRON );
         }
     }
     if( !bHandled && !mrView.KeyInput( rKEvt ) )
@@ -495,7 +495,7 @@ void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt )
 
             SfxViewFrame *pTmpFrm = mrView.GetViewFrame();
             pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0,
-                                                    SFX_CALLMODE_ASYNCHRON );
+                                                    SfxCallMode::ASYNCHRON );
         }
         else if ( bIsDocPos || bPosInEmptyPage )
         {
@@ -912,7 +912,7 @@ MOVEPAGE:
             //  print preview is now always in the same frame as the tab view
             //  -> always switch this frame back to normal view
             //  (ScTabViewShell ctor reads stored view data)
-            GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, 0, 0, SFX_CALLMODE_ASYNCHRON );
+            GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::ASYNCHRON );
             break;
         case FN_INSERT_BREAK:
         {
@@ -924,7 +924,7 @@ MOVEPAGE:
             SetNewPage( nSelPage );
             SfxViewFrame *pTmpFrm = GetViewFrame();
             pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0,
-                                                    SFX_CALLMODE_ASYNCHRON );
+                                                    SfxCallMode::ASYNCHRON );
         }
         break;
         default:
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 1b93bc50cae4..7be4f15c7efd 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -964,7 +964,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     // Update all tables if necessary:
     if( m_pWrtShell->GetDoc()->IsUpdateTOX() )
     {
-        SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
+        SfxRequest aSfxRequest( FN_UPDATE_TOX, SfxCallMode::SLOT, GetPool() );
         Execute( aSfxRequest );
         m_pWrtShell->GetDoc()->SetUpdateTOX( false );     // reset again
         m_pWrtShell->SttEndDoc(true);
@@ -993,7 +993,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         !pVFrame->GetChildWindow( SID_NAVIGATOR ))
     {
         SfxBoolItem aNavi(SID_NAVIGATOR, true);
-        GetDispatcher().Execute(SID_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aNavi, 0L);
+        GetDispatcher().Execute(SID_NAVIGATOR, SfxCallMode::ASYNCHRON, &aNavi, 0L);
     }
 
     uno::Reference< frame::XFrame >  xFrame = pVFrame->GetFrame().GetFrameInterface();
@@ -1643,7 +1643,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                         }
                     }
                     SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadonly);
-                    GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON,
+                    GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::ASYNCHRON,
                                                 &aItem, 0L );
                 }
                 break;
@@ -1656,7 +1656,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                         GetFormShell()->SetView(
                             PTR_CAST(FmFormView, GetWrtShell().GetDrawView()) );
                         SfxBoolItem aItem( SID_FM_DESIGN_MODE, !GetDocShell()->IsReadOnly());
-                        GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON,
+                        GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::SYNCHRON,
                                                   &aItem, 0L );
                     }
                 }
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index f2f68a9eedf8..cbb7a88ff7fb 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -700,7 +700,7 @@ void SwView::Execute(SfxRequest &rReq)
                 }
             }
             // Go to next change after accepting or rejecting one (fdo#83953)
-            GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SFX_CALLMODE_ASYNCHRON);
+            GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SfxCallMode::ASYNCHRON);
         }
         break;
 
@@ -863,7 +863,7 @@ void SwView::Execute(SfxRequest &rReq)
             else
             {
                 SfxBoolItem aItem( SID_WIN_FULLSCREEN, false );
-                GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SFX_CALLMODE_RECORD, &aItem, 0L );
+                GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SfxCallMode::RECORD, &aItem, 0L );
                 bIgnore = true;
             }
         }
@@ -908,7 +908,7 @@ void SwView::Execute(SfxRequest &rReq)
         case  FN_EDIT_CURRENT_TOX:
         {
             GetViewFrame()->GetDispatcher()->Execute(
-                                FN_INSERT_MULTI_TOX, SFX_CALLMODE_ASYNCHRON);
+                                FN_INSERT_MULTI_TOX, SfxCallMode::ASYNCHRON);
         }
         break;
         case FN_UPDATE_CUR_TOX:
@@ -1235,12 +1235,12 @@ void SwView::Execute(SfxRequest &rReq)
             {
                 SfxAllEnumItem aEnumItem(SID_OBJECT_ALIGN, nAlias - SID_OBJECT_ALIGN_LEFT);
                 GetViewFrame()->GetDispatcher()->Execute(
-                                SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0L);
+                                SID_OBJECT_ALIGN, SfxCallMode::ASYNCHRON, &aEnumItem, 0L);
             }
             else if(nAlias)
             //these slots are either re-mapped to text or object alignment
                 GetViewFrame()->GetDispatcher()->Execute(
-                                nAlias, SFX_CALLMODE_ASYNCHRON);
+                                nAlias, SfxCallMode::ASYNCHRON);
         }
         break;
         case SID_RESTORE_EDITING_VIEW:
@@ -1646,14 +1646,14 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
         case FN_STAT_PAGE:
         {
             GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR,
-                                      SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
+                                      SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
         }
         break;
 
         case FN_STAT_WORDCOUNT:
         {
             GetViewFrame()->GetDispatcher()->Execute(FN_WORDCOUNT_DIALOG,
-                                      SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
+                                      SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
         }
         break;
 
@@ -1680,7 +1680,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
         case FN_STAT_TEMPLATE:
         {
             GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_DLG,
-                                        SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
+                                        SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
         }
         break;
         case SID_ATTR_ZOOM:
@@ -1818,7 +1818,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
             }
             if( nId )
                 GetViewFrame()->GetDispatcher()->Execute(nId,
-                    SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
+                    SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
         }
         break;
 
@@ -2228,7 +2228,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
                 // update all "table of ..." sections if needed
                 if( m_pWrtShell->IsUpdateTOX() )
                 {
-                    SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
+                    SfxRequest aReq( FN_UPDATE_TOX, SfxCallMode::SLOT, GetPool() );
                     Execute( aReq );
                     m_pWrtShell->SetUpdateTOX( false ); // reset
                 }
@@ -2355,7 +2355,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
             if(bCallAddressPilot)
             {
                 GetViewFrame()->GetDispatcher()->Execute(
-                                SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON);
+                                SID_ADDRESS_DATA_SOURCE, SfxCallMode::SYNCHRON);
                 if ( lcl_NeedAdditionalDataSource( xDBContext ) )
                     // no additional data source has been created
                     // -> assume that the user has cancelled the pilot
@@ -2372,7 +2372,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
             //then show the "Data base only" field dialog
             SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, true);
             pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY,
-                                                SFX_CALLMODE_SYNCHRON, &aOn, 0L);
+                                                SfxCallMode::SYNCHRON, &aOn, 0L);
             return;
         }
         else
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index 15cc3e47b47c..2a4c521e214c 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -20,6 +20,7 @@
 #include "cmdid.h"
 #include "uiitems.hxx"
 #include <vcl/window.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/stritem.hxx>
@@ -56,7 +57,7 @@ void SwView::ExecColl(SfxRequest &rReq)
                         SfxUInt16Item aFamItem( SID_STYLE_FAMILY,
                                             SFX_STYLE_FAMILY_PAGE);
                         SwPtrItem aShell(FN_PARAM_WRTSHELL, GetWrtShellPtr());
-                        SfxRequest aReq(SID_STYLE_APPLY, 0, GetPool());
+                        SfxRequest aReq(SID_STYLE_APPLY, SfxCallMode::SLOT, GetPool());
                         aReq.AppendItem(aName);
                         aReq.AppendItem(aFamItem);
                         aReq.AppendItem(aShell);
@@ -66,7 +67,7 @@ void SwView::ExecColl(SfxRequest &rReq)
             }
             else
             {
-                SfxRequest aReq(FN_FORMAT_PAGE_DLG, 0, GetPool());
+                SfxRequest aReq(FN_FORMAT_PAGE_DLG, SfxCallMode::SLOT, GetPool());
                 GetCurShell()->ExecuteSlot(aReq);
             }
         }
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 14c416f706d3..52929b13c4c3 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -722,7 +722,7 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
 IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
 {
     if (pInfo->nCommand == SPELLCMD_STARTSPELLDLG)
-        GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON);
+        GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON);
     return 0;
 }
 
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 2082a43a5b41..a8043956e0d3 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -442,7 +442,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
             if(rSh.HasSelection() && !bNext == rSh.IsCrsrPtAtEnd())
                 rSh.SwapPam();
             m_pSrchItem->SetBackward(!bNext);
-            SfxRequest aReq(FN_REPEAT_SEARCH, SFX_CALLMODE_SLOT, pThis->GetPool());
+            SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, pThis->GetPool());
             pThis->ExecSearch(aReq);
             m_pSrchItem->SetBackward(bBackward);
         }
@@ -545,7 +545,7 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler )
 
     SfxStringItem aDefPage(SID_PARA_DLG, sDefPage);
     GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG,
-                                SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+                                SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
                                 &aDefPage, 0L );
     return 0;
 }
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 4f576a0ecf14..3d64f8b8b834 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -170,7 +170,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
                 SfxStringItem aPrinterName(SID_PRINTER_NAME, sFaxName);
                 SfxBoolItem aSilent( SID_SILENT, true );
                 GetViewFrame()->GetDispatcher()->Execute( SID_PRINTDOC,
-                            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+                            SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
                             &aPrinterName, &aSilent, 0L );
             }
             else
@@ -181,7 +181,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
                 aInfoBox.Execute();
                 SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
                 GetViewFrame()->GetDispatcher()->Execute(SID_SW_EDITOPTIONS,
-                            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+                            SfxCallMode::SYNCHRON|SfxCallMode::RECORD,
                             &aDefPage, 0L );
             }
         }
@@ -208,7 +208,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
                 {
                     SfxBoolItem aBool(FN_QRY_MERGE, true);
                     GetViewFrame()->GetDispatcher()->Execute(
-                                FN_QRY_MERGE, SFX_CALLMODE_ASYNCHRON, &aBool, 0L);
+                                FN_QRY_MERGE, SfxCallMode::ASYNCHRON, &aBool, 0L);
                     rReq.Ignore();
                     return;
                 }
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index e02b0a9805b8..8ec7d51eea4d 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -230,7 +230,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
         SfxUsrAnyItem aDBProperties(FN_PARAM_DATABASE_PROPERTIES, uno::makeAny(aArgs));
         m_pView->GetViewFrame()->GetDispatcher()->Execute(
             FN_MAILMERGE_WIZARD,
-            SFX_CALLMODE_ASYNCHRON,
+            SfxCallMode::ASYNCHRON,
             &aDBProperties, 0L);
     }
 #endif
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index a4d2652d5b77..62a899747808 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -70,7 +70,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons
         aState = frame::DispatchResultState::FAILURE;
     else
     {
-        SfxRequest aReq( pSlot, aArgs, SFX_CALLMODE_SYNCHRON, SW_MOD()->GetPool() );
+        SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SW_MOD()->GetPool() );
         const SfxPoolItem* pResult = SW_MOD()->ExecuteSlot( aReq );
         if ( pResult )
             aState = frame::DispatchResultState::SUCCESS;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 09e5c9ace00e..bf543d10ed45 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1143,7 +1143,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption
     if(IsValid())
     {
         SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, 7 );
-        SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SFX_CALLMODE_SYNCHRON,
+        SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SfxCallMode::SYNCHRON,
                                     pDocShell->GetDoc()->GetAttrPool());
             aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true));
 
@@ -1918,7 +1918,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
         {
             sal_Int16 nYear = 0;
             aValue >>= nYear;
-            SfxRequest aRequest ( SID_ATTR_YEAR2000, SFX_CALLMODE_SLOT, pDocShell->GetDoc()->GetAttrPool());
+            SfxRequest aRequest ( SID_ATTR_YEAR2000, SfxCallMode::SLOT, pDocShell->GetDoc()->GetAttrPool());
             aRequest.AppendItem(SfxUInt16Item( SID_ATTR_YEAR2000, static_cast < sal_uInt16 > ( nYear ) ) );
             pDocShell->Execute ( aRequest );
         }
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index ec9e9402deaf..f5600e450691 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1332,7 +1332,7 @@ sal_Bool SwXTextViewCursor::screenDown()
     bool bRet = false;
     if(m_pView)
     {
-        SfxRequest aReq(FN_PAGEDOWN, SFX_CALLMODE_SLOT, m_pView->GetPool());
+        SfxRequest aReq(FN_PAGEDOWN, SfxCallMode::SLOT, m_pView->GetPool());
         m_pView->Execute(aReq);
         const SfxPoolItem* pRet = aReq.GetReturnValue();
         bRet = pRet && ((const SfxBoolItem*)pRet)->GetValue();
@@ -1349,7 +1349,7 @@ sal_Bool SwXTextViewCursor::screenUp()
     bool bRet = false;
     if(m_pView)
     {
-        SfxRequest aReq(FN_PAGEUP, SFX_CALLMODE_SLOT, m_pView->GetPool());
+        SfxRequest aReq(FN_PAGEUP, SfxCallMode::SLOT, m_pView->GetPool());
         m_pView->Execute(aReq);
         const SfxPoolItem* pRet = aReq.GetReturnValue();
         bRet = pRet && ((const SfxBoolItem*)pRet)->GetValue();
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index f64ae4eb702e..e4e5c90c0342 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -117,7 +117,7 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt )
             {
                 SfxUInt16Item aBookmark( FN_STAT_BOOKMARK, aBookmarkIdx[nCurrId] );
                 SfxViewFrame::Current()->GetDispatcher()->Execute( FN_STAT_BOOKMARK,
-                    SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD,
+                    SfxCallMode::ASYNCHRON|SfxCallMode::RECORD,
                                         &aBookmark, 0L );
             }
         }
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 3d47d913ce6e..d00b0b9b360a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3199,7 +3199,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode)
                         SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, (void*)pBase);
                         pActiveShell->GetView().GetViewFrame()->
                             GetDispatcher()->Execute(FN_INSERT_MULTI_TOX,
-                                            SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0L);
+                                            SfxCallMode::ASYNCHRON, &aPtrItem, 0L);
 
                     }
                 break;
@@ -3238,7 +3238,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode)
     }
     if(nSlot)
         pActiveShell->GetView().GetViewFrame()->
-                    GetDispatcher()->Execute(nSlot, SFX_CALLMODE_ASYNCHRON);
+                    GetDispatcher()->Execute(nSlot, SfxCallMode::ASYNCHRON);
     else if(xNameAccess.is())
     {
         uno::Any aObj = xNameAccess->getByName(pCnt->GetName());
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 39ad2e55e56f..e3ac3aab85f9 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -838,7 +838,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
             {
                 SfxStringItem aName(FN_EDIT_REGION,
                         pCont->GetSection()->GetSectionName());
-                rDispatch.Execute(FN_EDIT_REGION, SFX_CALLMODE_ASYNCHRON, &aName, 0L);
+                rDispatch.Execute(FN_EDIT_REGION, SfxCallMode::ASYNCHRON, &aName, 0L);
             }
         }
         break;
@@ -922,7 +922,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
              const SfxFrameItem* pItem = (SfxFrameItem*)
                             rDispatch.Execute(SID_NEWDOCDIRECT,
-                                SFX_CALLMODE_SYNCHRON, &aFactory, 0L);
+                                SfxCallMode::SYNCHRON, &aFactory, 0L);
 
             // save at
             SfxFrame* pFrm = pItem ? pItem->GetFrame() : 0;
@@ -931,7 +931,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
             {
                 const SfxBoolItem* pBool = (const SfxBoolItem*)
                         pFrame->GetDispatcher()->Execute(
-                                SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON );
+                                SID_SAVEASDOC, SfxCallMode::SYNCHRON );
                 SfxObjectShell& rObj = *pFrame->GetObjectShell();
                 const SfxMedium* pMedium = rObj.GetMedium();
                 OUString sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI));
@@ -961,7 +961,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
                     }
                     else
                         pFrame->GetDispatcher()->Execute(SID_CLOSEWIN,
-                                                SFX_CALLMODE_SYNCHRON);
+                                                SfxCallMode::SYNCHRON);
                 }
                 else
                 {
@@ -1184,7 +1184,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
         SfxStringItem aTargetFrameName( SID_TARGETNAME, "_blank" );
         SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle());
         pActiveShell->GetView().GetViewFrame()->GetDispatcher()->
-                Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON,
+                Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON,
                             &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0L);
     }
 }
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 47f9dcc9bfc0..c5bf16abc16c 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1215,7 +1215,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 SfxLinkItem aLink( SID_DONELINK,
                                     LINK( this, SwNavigationPI, DoneLink ) );
                 GetActiveView()->GetViewFrame()->GetDispatcher()->Execute(
-                            SID_OPENDOC, SFX_CALLMODE_ASYNCHRON,
+                            SID_OPENDOC, SfxCallMode::ASYNCHRON,
                             &aFileItem, &aOptionsItem, &aLink, 0L );
             }
         }
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index 29a3f0c0283d..a22c112f24c8 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -123,7 +123,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
                         SfxStringItem aStyle( FN_SET_PAGE_STYLE, pStyle->GetName() );
                         pWrtShell->GetView().GetViewFrame()->GetDispatcher()->Execute(
                                     FN_SET_PAGE_STYLE,
-                                    SFX_CALLMODE_SLOT|SFX_CALLMODE_RECORD,
+                                    SfxCallMode::SLOT|SfxCallMode::RECORD,
                                     &aStyle, 0L );
                     }
                 }
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index cf394fb00d32..484a551c6747 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -258,7 +258,7 @@ bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* p
     GetWin()->Update();
     if(RET_YES == nRet)
     {
-        GetView().GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FIELD, SFX_CALLMODE_SYNCHRON);
+        GetView().GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FIELD, SfxCallMode::SYNCHRON);
     }
     return bRet;
 }
@@ -340,7 +340,7 @@ void SwWrtShell::ClickToField( const SwField& rFld )
                 //#97295# immediately select the right shell
                 GetView().StopShellTimer();
                 GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId,
-                            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
+                            SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
                 EndUndo( UNDO_END );
             }
         }
@@ -499,8 +499,8 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
                 0L
     };
 
-    pViewFrm->GetDispatcher()->GetBindings()->Execute( SID_OPENDOC, aArr,
-            SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD );
+    pViewFrm->GetDispatcher()->GetBindings()->Execute( SID_OPENDOC, aArr, 0,
+            SfxCallMode::ASYNCHRON|SfxCallMode::RECORD );
 }
 
 void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 894b6ba8e6c0..118cbf87470c 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -403,12 +403,12 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
                 {
                     // #TODO is this necessary ( calc specific )
 //                  SC_MOD()->InputEnterHandler();
-                    pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
+                    pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SfxCallMode::SYNCHRON );
                     WaitUntilPreviewIsClosed( pViewFrame );
                 }
             }
             else
-                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SfxCallMode::SYNCHRON, aArgs );
         }
 
     }
author	Noel Grandin <noel@peralex.com>	2014-10-11 16:01:26 +0200
committer	Noel Grandin <noelgrandin@gmail.com>	2014-10-11 15:14:52 +0000
commit	8044acf2db9d125d5ed58ed25df5df4a90f37ac6 (patch)
tree	67af1fff3f9bc0d144b80d5ecbe5a078cd08dbd3
parent	cb7ede2d9970a4d162dc71922f578922c0d6235a (diff)