[Libreoffice-commits] core.git: avmedia/source basctl/source cui/source include/sfx2 include/vbahelper sc/source sd/source sfx2/source starmath/qa starmath/source svx/source sw/source vbahelper/source
Noel Grandin
noel at peralex.com
Sat Oct 11 08:15:53 PDT 2014
avmedia/source/framework/mediaplayer.cxx | 2
basctl/source/basicide/basicbox.cxx | 2
basctl/source/basicide/basobj3.cxx | 2
basctl/source/basicide/bastype2.cxx | 2
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/macrodlg.cxx | 12 +-
basctl/source/basicide/moduldl2.cxx | 8 -
basctl/source/basicide/moduldlg.cxx | 18 ++--
basctl/source/basicide/tbxctl.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 8 -
cui/source/dialogs/hldocntp.cxx | 4
cui/source/dialogs/hlinettp.cxx | 2
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/options/treeopt.cxx | 14 +--
cui/source/tabpages/tpcolor.cxx | 4
include/sfx2/bindings.hxx | 42 +++++++---
include/sfx2/dispatch.hxx | 4
include/sfx2/request.hxx | 11 +-
include/vbahelper/vbahelper.hxx | 2
sc/source/core/data/global.cxx | 2
sc/source/ui/app/inputwin.cxx | 6 -
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dialogs/searchresults.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/fuconstr.cxx | 8 -
sc/source/ui/drawfunc/fudraw.cxx | 6 -
sc/source/ui/drawfunc/fusel.cxx | 4
sc/source/ui/drawfunc/futext.cxx | 14 +--
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 2
sc/source/ui/navipi/navipi.cxx | 10 +-
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 16 +--
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 6 -
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 14 +--
sc/source/ui/sidebar/CellLineStyleControl.cxx | 4
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 6 -
sc/source/ui/undo/undotab.cxx | 10 +-
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbahelper.cxx | 4
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 16 +--
sc/source/ui/view/preview.cxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/spelldialog.cxx | 2
sc/source/ui/view/tabcont.cxx | 6 -
sc/source/ui/view/tabview5.cxx | 4
sc/source/ui/view/tabvwsh3.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 14 +--
sc/source/ui/view/tabvwsh5.cxx | 2
sc/source/ui/view/tabvwsh9.cxx | 2
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 10 +-
sc/source/ui/view/viewfun2.cxx | 4
sc/source/ui/view/viewfun4.cxx | 4
sc/source/ui/view/viewfun5.cxx | 2
sc/source/ui/view/viewfun6.cxx | 4
sc/source/ui/view/viewutil.cxx | 2
sd/source/core/drawdoc4.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 6 -
sd/source/ui/app/sdmod1.cxx | 8 -
sd/source/ui/app/tmplctrl.cxx | 2
sd/source/ui/dlg/LayerTabBar.cxx | 8 -
sd/source/ui/dlg/NavigatorChildWindow.cxx | 2
sd/source/ui/dlg/SpellDialogChildWindow.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 6 -
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 6 -
sd/source/ui/docshell/docshel4.cxx | 4
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/func/fucon3d.cxx | 2
sd/source/ui/func/fuconarc.cxx | 2
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconcs.cxx | 2
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fuconuno.cxx | 2
sd/source/ui/func/fucushow.cxx | 2
sd/source/ui/func/fudraw.cxx | 12 +-
sd/source/ui/func/fuexpand.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fuoltext.cxx | 4
sd/source/ui/func/fupoor.cxx | 18 ++--
sd/source/ui/func/fuprlout.cxx | 2
sd/source/ui/func/fuscale.cxx | 6 -
sd/source/ui/func/fusel.cxx | 32 +++----
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futext.cxx | 6 -
sd/source/ui/func/undoheaderfooter.cxx | 4
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/slideshow/SlideShowRestarter.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 4
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/table/TableDesignPane.cxx | 6 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 4
sd/source/ui/unoidl/unomodule.cxx | 2
sd/source/ui/view/Outliner.cxx | 6 -
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/ViewShellImplementation.cxx | 2
sd/source/ui/view/ViewShellManager.cxx | 2
sd/source/ui/view/drbezob.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 6 -
sd/source/ui/view/drviews1.cxx | 4
sd/source/ui/view/drviews2.cxx | 34 ++++----
sd/source/ui/view/drviews3.cxx | 6 -
sd/source/ui/view/drviews4.cxx | 6 -
sd/source/ui/view/drviews5.cxx | 6 -
sd/source/ui/view/drviews9.cxx | 2
sd/source/ui/view/drviewsa.cxx | 8 -
sd/source/ui/view/drviewsb.cxx | 4
sd/source/ui/view/drviewsd.cxx | 2
sd/source/ui/view/drviewse.cxx | 12 +-
sd/source/ui/view/drviewsi.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/presvish.cxx | 2
sd/source/ui/view/sdview.cxx | 4
sd/source/ui/view/sdview4.cxx | 3
sd/source/ui/view/sdwindow.cxx | 4
sd/source/ui/view/tabcontr.cxx | 14 +--
sd/source/ui/view/unmodpg.cxx | 4
sd/source/ui/view/viewoverlaymanager.cxx | 2
sd/source/ui/view/viewshe2.cxx | 6 -
sd/source/ui/view/viewshe3.cxx | 4
sd/source/ui/view/viewshel.cxx | 2
sfx2/source/appl/appdde.cxx | 2
sfx2/source/appl/appopen.cxx | 8 -
sfx2/source/appl/appserv.cxx | 10 +-
sfx2/source/appl/sfxpicklist.cxx | 2
sfx2/source/control/bindings.cxx | 10 +-
sfx2/source/control/dispatch.cxx | 24 ++---
sfx2/source/control/request.cxx | 24 ++---
sfx2/source/control/unoctitm.cxx | 8 -
sfx2/source/dialog/basedlgs.cxx | 4
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/recfloat.cxx | 4
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/dialog/titledockwin.cxx | 2
sfx2/source/dialog/versdlg.cxx | 6 -
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/objserv.cxx | 8 -
sfx2/source/view/frame.cxx | 2
sfx2/source/view/frmload.cxx | 2
sfx2/source/view/viewfrm.cxx | 10 +-
sfx2/source/view/viewfrm2.cxx | 2
sfx2/source/view/viewsh.cxx | 2
starmath/qa/cppunit/test_starmath.cxx | 28 +++---
starmath/source/ElementsDockingWindow.cxx | 2
starmath/source/dialog.cxx | 2
starmath/source/edit.cxx | 4
starmath/source/toolbox.cxx | 4
starmath/source/view.cxx | 4
svx/source/dialog/_bmpmask.cxx | 2
svx/source/dialog/_contdlg.cxx | 4
svx/source/dialog/fontwork.cxx | 20 ++--
svx/source/dialog/imapdlg.cxx | 4
svx/source/dialog/rubydialog.cxx | 8 -
svx/source/dialog/srchdlg.cxx | 14 +--
svx/source/dialog/svxruler.cxx | 12 +-
svx/source/engine3d/float3d.cxx | 12 +-
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/fmshell.cxx | 6 -
svx/source/form/fmshimp.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/gallery2/galctrl.cxx | 2
svx/source/mnuctrls/SmartTagCtl.cxx | 4
svx/source/mnuctrls/fntctl.cxx | 2
svx/source/mnuctrls/fntszctl.cxx | 2
svx/source/sidebar/area/AreaPropertyPanel.cxx | 26 +++---
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 2
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 16 +--
svx/source/sidebar/line/LinePropertyPanel.cxx | 20 ++--
svx/source/sidebar/line/LineWidthControl.cxx | 6 -
svx/source/sidebar/paragraph/ParaBulletsControl.cxx | 4
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 6 -
svx/source/sidebar/paragraph/ParaNumberingControl.cxx | 4
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 28 +++---
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 20 ++--
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 14 +--
svx/source/sidebar/text/TextUnderlineControl.cxx | 4
svx/source/stbctrls/pszctrl.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 18 ++--
sw/source/core/doc/docglbl.cxx | 2
sw/source/ui/dbui/mmmergepage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 4
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/index/swuiidxmrk.cxx | 4
sw/source/uibase/app/apphdl.cxx | 6 -
sw/source/uibase/app/applab.cxx | 2
sw/source/uibase/app/docsh2.cxx | 16 +--
sw/source/uibase/app/docst.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 2
sw/source/uibase/dbui/mailmergechildwindow.cxx | 2
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 4
sw/source/uibase/docvw/PageBreakWin.cxx | 4
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2
sw/source/uibase/docvw/SidebarWin.cxx | 4
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/envelp/syncbtn.cxx | 2
sw/source/uibase/fldui/fldmgr.cxx | 2
sw/source/uibase/lingu/olmenu.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 4
sw/source/uibase/ribbar/inputwin.cxx | 4
sw/source/uibase/ribbar/tbxanchr.cxx | 2
sw/source/uibase/shells/basesh.cxx | 6 -
sw/source/uibase/shells/beziersh.cxx | 2
sw/source/uibase/shells/drawdlg.cxx | 4
sw/source/uibase/shells/drformsh.cxx | 4
sw/source/uibase/shells/frmsh.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 6 -
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/sidebar/PageColumnControl.cxx | 2
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 12 +-
sw/source/uibase/sidebar/PageSizeControl.cxx | 2
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2
sw/source/uibase/smartmenu/stmenu.cxx | 2
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/uiview/pview.cxx | 8 -
sw/source/uibase/uiview/view.cxx | 8 -
sw/source/uibase/uiview/view2.cxx | 24 ++---
sw/source/uibase/uiview/viewcoll.cxx | 5 -
sw/source/uibase/uiview/viewdraw.cxx | 2
sw/source/uibase/uiview/viewmdi.cxx | 4
sw/source/uibase/uiview/viewprt.cxx | 6 -
sw/source/uibase/uno/unodispatch.cxx | 2
sw/source/uibase/uno/unomodule.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 4
sw/source/uibase/uno/unotxvw.cxx | 4
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/content.cxx | 4
sw/source/uibase/utlui/glbltree.cxx | 10 +-
sw/source/uibase/utlui/navipi.cxx | 2
sw/source/uibase/utlui/tmplctrl.cxx | 2
sw/source/uibase/wrtsh/wrtsh2.cxx | 8 -
vbahelper/source/vbahelper/vbahelper.cxx | 4
254 files changed, 717 insertions(+), 690 deletions(-)
New commits:
commit 8044acf2db9d125d5ed58ed25df5df4a90f37ac6
Author: Noel Grandin <noel at peralex.com>
Date: Sat Oct 11 16:01:26 2014 +0200
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 at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 1883aad..d9f4302 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 5699f1a..0404494 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 2889007..1155384 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 42f7b0d..05894ad 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 994ad6e..55a3dc4 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 a88cca4..5079378 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 15e16db..e6e8187 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 9269d47..f1381b7 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 2b331ce..721c137 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 a6440fc..a8a87d2 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 7224ed3..c355fe0 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 97ea77d..e03e940 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 433d06f..8f51b8f 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 00f8c97..8540db4 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 8890034..52fa7ed 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 2fc1515..58e8a1c 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 0bccd70..2fbe66d 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 eac691e..3b1476c 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 a47f962..f862cb0 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 a5d119b..0d27200 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 ae9e84c..150ed87 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 6393ed3..eea595e 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 ce1db4d..52ec400 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 ec241f3..1d572b8 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 bf401ce..45b9562 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 463e5a5..6951e3b 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 1815e03..4ca889b 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 f317734..fcc55f3 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 8027dc8..a8f7883 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 5a82ec9..315f557 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 5a2fd1f..84fdcac 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 23ba487..eb2ab21 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 35feb3f..c00b284 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 cb33a32..bfb3003 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 9c03ed7..32ea15d 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 ea837d4..2a294fb 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 f4bdae6..10ffbfa 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 44d5455..cbfeca1 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 1f5c137..f6e01c4 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 0466e87..eaf20ba 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 61a6ad6..234ea33 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 3e59aea..4e5ade1 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 8d2ade9..9907448 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 31b10db..bd528f7 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 fcb00df..514b455 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 f19d78e..6efa8f3 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 826876b..d120a7c 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 04c4f08..dfd8068 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 0b632d7..6852923 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 4976326..dffde94 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 2d0a52b..04b71d2 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 09ba55e..99353aa 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 bbf1c38..b4bf4ab 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 219adb2..7fd9bde 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 e7b50e8..ab843ee 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 798ac3a..be99e68 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 43da321..b3f75e4 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 ce52883..68757a2 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 e5acb09..65f6d07 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 5715326..ded17ef 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 b3c558d..ee241c4 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 e2c77bd..20b42c4 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 c0e51fb..6cfbc96 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 e010c86..5b422dfb 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 30fe192..9e27f03 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 4a69e92..bd0fb12 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 8ddef3c..452bfa9 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 25859d3..27ff0f4 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 d88650a..6842fbc 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 aee4241..8b245fb 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 5daa653..1c8a296 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 96465a4..51fda0c 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 a93091e..0899fff 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 e853d6f..9c1a84b 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 77a3476..1af9937 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 30f0b8b..c494cdc 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 b0e2729..98df417 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 3dd4c018..480a5f7 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);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list