diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-11 16:01:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-11 15:14:52 +0000 |
| commit | 8044acf2db9d125d5ed58ed25df5df4a90f37ac6 (patch) | |
| tree | 67af1fff3f9bc0d144b80d5ecbe5a078cd08dbd3 /sw | |
| parent | cb7ede2d9970a4d162dc71922f578922c0d6235a (diff) | |
convert SFX_CALLMODE constants to SfxCallMode enum class
and fix a couple of bugs in SC and SW where the call mode was
being passed to the hints parameter by accident
Change-Id: Ief805410b3f7035e012e229e77f92d5832430f58
Reviewed-on: https://gerrit.libreoffice.org/11916
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
55 files changed, 117 insertions, 116 deletions
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index f5c4aed0844f..598fc3a94c33 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -509,7 +509,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, } // The medium isn't locked after reopening the document. - SfxRequest aReq( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, GetAttrPool() ); + SfxRequest aReq( SID_SAVEASDOC, SfxCallMode::SYNCHRON, GetAttrPool() ); aReq.AppendItem( SfxStringItem( SID_FILE_NAME, rPath ) ); aReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) ); if(pFilter) diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index a888cfef3a45..f0fbebcaf046 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -73,7 +73,7 @@ IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl) if(pTargetView) { pTargetView->GetViewFrame()->GetDispatcher()->Execute( - FID_SEARCH_NOW, SFX_CALLMODE_SYNCHRON, &aSearchItem, &aQuiet, 0L ); + FID_SEARCH_NOW, SfxCallMode::SYNCHRON, &aSearchItem, &aQuiet, 0L ); } return 0; diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 369d41f4197c..a164ad9640af 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -518,7 +518,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) uno::Reference< frame::XFrame > xFrame = pSourceViewFrm->GetFrame().GetFrameInterface(); xFrame->getContainerWindow()->setVisible(sal_True); - pSourceViewFrm->GetDispatcher()->Execute(SID_SAVEDOC, SFX_CALLMODE_SYNCHRON); + pSourceViewFrm->GetDispatcher()->Execute(SID_SAVEDOC, SfxCallMode::SYNCHRON); xFrame->getContainerWindow()->setVisible(sal_False); SwDocShell* pDocShell = pSourceView->GetDocShell(); //if the document has been saved its URL has to be stored for diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 11b528b4f1f5..1ed05cd896cf 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -108,7 +108,7 @@ bool SwFldDlg::Close() { m_pBindings->GetDispatcher()-> Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); return true; } @@ -208,7 +208,7 @@ void SwFldDlg::ReInitDlg() if (bNewMode != m_bHtmlMode) { SfxViewFrame::Current()->GetDispatcher()-> - Execute(FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + Execute(FN_INSERT_FIELD, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); Close(); } diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index b1d201e7e265..f80a72107061 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -318,7 +318,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl) //only if there actually are columns! if(rColItem.GetNumCols() > 1) rWrtShell.GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_INSERT_REGION, SFX_CALLMODE_ASYNCHRON, *pSelectionSet ); + FN_INSERT_REGION, SfxCallMode::ASYNCHRON, *pSelectionSet ); } if(pSectionSet && pSectionSet->Count() && bSectionChanged ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 4b8cff892862..2ebdcee14dcd 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2092,7 +2092,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) Application::SetDefDialogParent( pBtn ); ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(). GetView().GetViewFrame()->GetDispatcher()->Execute( - SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL, + SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL, &aStyle, &aFamily, 0L); Application::SetDefDialogParent( pDefDlgParent ); } @@ -3607,7 +3607,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) Application::SetDefDialogParent( pBtn ); SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(); rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( - SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL, + SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL, &aStyle, &aFamily, 0L); Application::SetDefDialogParent( pDefDlgParent ); } diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 8cf9a0fef693..085ca163820f 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -614,7 +614,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl) { sal_uInt16 nSlot = FN_INSERT_IDX_ENTRY_DLG; SfxViewFrame::Current()->GetDispatcher()->Execute(nSlot, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); } else { @@ -1116,7 +1116,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl) { sal_uInt16 nSlot = FN_INSERT_AUTH_ENTRY_DLG; SfxViewFrame::Current()->GetDispatcher()->Execute(nSlot, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); } else { diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 3a96259ee8df..8556b97e010e 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -203,7 +203,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) SfxBoolItem aHidden( SID_HIDDEN, true ); SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()-> - Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON, + Execute(SID_OPENDOC, SfxCallMode::SYNCHRON, &aURL, &aHidden, &aReferer, &aTargetFrameName, 0L); SfxShell* pShell = pItem ? pItem->GetShell() : 0; @@ -229,7 +229,7 @@ SwView* lcl_LoadDoc(SwView* pView, const OUString& rURL) SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName()); const SfxFrameItem* pItem = (SfxFrameItem*) pView->GetViewFrame()->GetDispatcher()->Execute(SID_NEWDOCDIRECT, - SFX_CALLMODE_SYNCHRON, &aFactory, 0L); + SfxCallMode::SYNCHRON, &aFactory, 0L); SfxFrame* pFrm = pItem ? pItem->GetFrame() : 0; SfxViewFrame* pFrame = pFrm ? pFrm->GetCurrentViewFrame() : 0; pNewView = pFrame ? PTR_CAST(SwView, pFrame->GetViewShell()) : 0; @@ -468,7 +468,7 @@ IMPL_LINK( SwMailMergeWizardExecutor, EndDialogHdl, AbstractMailMergeWizard*, pD pTempView->SetMailMergeConfigItem(m_pMMConfig, m_pWizard->GetRestartPage(), !bResult); SfxViewFrame* pViewFrame = pTempView->GetViewFrame(); pViewFrame->GetDispatcher()->Execute( - FN_MAILMERGE_CHILDWINDOW, SFX_CALLMODE_SYNCHRON); + FN_MAILMERGE_CHILDWINDOW, SfxCallMode::SYNCHRON); ExecutionFinished( false ); break; } diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 867766228951..99ec89bccd8f 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -402,7 +402,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) { SfxDispatcher* pDisp = pViewFrame->GetDispatcher(); assert(pDisp && "No dispatcher in frame?"); - pDisp->Execute(FN_SYNC_LABELS, SFX_CALLMODE_ASYNCHRON); + pDisp->Execute(FN_SYNC_LABELS, SfxCallMode::ASYNCHRON); } rReq.SetReturnValue(SfxVoidItem(bLabel ? FN_LABEL : FN_BUSINESS_CARD)); } diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index f4a4e9fb87c0..8117908fa512 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -352,7 +352,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pAFlags->m_pAutoCompleteList = &aTmpLst; SfxApplication* pApp = SfxGetpApp(); - SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool()); + SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SfxCallMode::SYNCHRON, pApp->GetPool()); SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, true ); aAppReq.AppendItem(aSwOptions); @@ -450,7 +450,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pTmpFrm = SfxViewFrame::GetFirst( this ); if (pTmpFrm) - pTmpFrm->GetDispatcher()->Execute( nSlotId, 0, 0, SFX_CALLMODE_ASYNCHRON ); + pTmpFrm->GetDispatcher()->Execute( nSlotId, SfxCallMode::ASYNCHRON ); } rReq.SetReturnValue(SfxBoolItem(SID_PRINTPREVIEW, bSet )); @@ -622,7 +622,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxStringItem aFilter(SID_FILTER_NAME, pHtmlFlt->GetName()); const SfxBoolItem* pBool = (const SfxBoolItem*) pViewFrm->GetDispatcher()->Execute( - SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, &aName, &aFilter, 0L ); + SID_SAVEASDOC, SfxCallMode::SYNCHRON, &aName, &aFilter, 0L ); if(!pBool || !pBool->GetValue()) break; } @@ -661,7 +661,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } } if(nSlot) - pViewFrm->GetDispatcher()->Execute(nSlot, SFX_CALLMODE_SYNCHRON); + pViewFrm->GetDispatcher()->Execute(nSlot, SfxCallMode::SYNCHRON); if(bSetModified) GetDoc()->getIDocumentState().SetModified(); if(pSavePrinter) @@ -1071,7 +1071,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxDispatcher* pDispatch = pViewShell->GetDispatcher(); pDispatch->Execute( SID_OPENDOC, - SFX_CALLMODE_ASYNCHRON, + SfxCallMode::ASYNCHRON, &aName, &aReferer, pFrameItem.get(), 0L ); @@ -1129,7 +1129,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.text.TextDocument")); SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); pViewShell->GetDispatcher()->Execute( - SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L); + SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aApp, &aTarget, 0L); } break; @@ -1314,7 +1314,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName ); pSrcView->GetViewFrame()->GetDispatcher()->Execute( SID_BASICIDE_LIBREMOVED, - SFX_CALLMODE_SYNCHRON, + SfxCallMode::SYNCHRON, &aShellItem, &aLibNameItem, 0L ); // Only the modules are deleted from the standard-lib @@ -1352,7 +1352,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie SfxViewShell* pViewShell = GetView() ? (SfxViewShell*)GetView() : SfxViewShell::Current(); SfxViewFrame* pViewFrm = pViewShell->GetViewFrame(); - pViewFrm->GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON ); + pViewFrm->GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON ); SubInitNew(); diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index d99b68e36087..b8413cd0da12 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -304,7 +304,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) case SID_STYLE_APPLY: if( !pArgs ) { - GetView()->GetViewFrame()->GetDispatcher()->Execute(SID_STYLE_DESIGNER, sal_False); + GetView()->GetViewFrame()->GetDispatcher()->Execute(SID_STYLE_DESIGNER); break; } else diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 4d504180d832..e6475255ba04 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -864,7 +864,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } if( !bMergeShell && pSourceDocSh->IsModified() ) - pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD); + pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SfxCallMode::SYNCHRON|SfxCallMode::RECORD); if( bMergeShell || !pSourceDocSh->IsModified() ) { const SfxFilter* pStoreToFilter = SwIoSystem::GetFileFilter( diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx index caaec215a799..6fe21b8c2148 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx @@ -75,7 +75,7 @@ SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings, IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl) { - GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SFX_CALLMODE_ASYNCHRON); + GetBindings().GetDispatcher()->Execute(FN_MAILMERGE_WIZARD, SfxCallMode::ASYNCHRON); return 0; } diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 89f25f74206e..8d9a3201cf95 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -428,7 +428,7 @@ The code below would only be part of the solution. } // close the spelling dialog - GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON); + GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); } } return aRet; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 5e72c8c877ca..fe1c4ed9ea42 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -2555,7 +2555,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aMediaURLStr ); rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( - SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, + SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L ); } #else @@ -2697,7 +2697,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData, SfxStringItem aDataDesc( nWh, sTxt ); rView.GetViewFrame()->GetDispatcher()->Execute( - nWh, SFX_CALLMODE_ASYNCHRON, &aDataDesc, + nWh, SfxCallMode::ASYNCHRON, &aDataDesc, pConnectionItem.get(), pColumnItem.get(), pSourceItem.get(), pCommandItem.get(), pCommandTypeItem.get(), pColumnNameItem.get(), pSelectionItem.get(), pCursorItem.get(), 0L); diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 8f472f48add1..c8b85747da61 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -237,7 +237,7 @@ void SwPageBreakWin::Select( ) SfxStringItem aItem(pEditWin->GetView().GetPool().GetWhich(FN_FORMAT_TABLE_DLG), "textflow"); pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_FORMAT_TABLE_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, NULL ); + FN_FORMAT_TABLE_DLG, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aItem, NULL ); rSh.Pop( false ); } @@ -250,7 +250,7 @@ void SwPageBreakWin::Select( ) SwPaMItem aPaMItem( pEditWin->GetView().GetPool( ).GetWhich( FN_PARAM_PAM ), &aPaM ); SfxStringItem aItem( pEditWin->GetView().GetPool( ).GetWhich( SID_PARA_DLG ), "textflow" ); pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute( - SID_PARA_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, &aPaMItem, NULL ); + SID_PARA_DLG, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aItem, &aPaMItem, NULL ); } rSh.LockView( bOldLock ); pEditWin->GrabFocus( ); diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index f6cba0bb8298..360590604d1a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -323,7 +323,7 @@ IMPL_LINK( SidebarTxtControl, OnlineSpellCallback, SpellCallbackInfo*, pInfo ) { if ( pInfo->nCommand == SPELLCMD_STARTSPELLDLG ) { - mrDocView.GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON); + mrDocView.GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); } return 0; } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index ba4c47437f42..e97589c76384 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1076,7 +1076,7 @@ void SwSidebarWin::ExecuteCommand(sal_uInt16 nSlot) case FN_DELETE_ALL_NOTES: case FN_HIDE_ALL_NOTES: // not possible as slot as this would require that "this" is the active postit - mrView.GetViewFrame()->GetBindings().Execute( nSlot, 0, 0, SFX_CALLMODE_ASYNCHRON ); + mrView.GetViewFrame()->GetBindings().Execute( nSlot, 0, 0, SfxCallMode::ASYNCHRON ); break; case FN_DELETE_NOTE_AUTHOR: case FN_HIDE_NOTE_AUTHOR: @@ -1086,7 +1086,7 @@ void SwSidebarWin::ExecuteCommand(sal_uInt16 nSlot) const SfxPoolItem* aItems[2]; aItems[0] = &aItem; aItems[1] = 0; - mrView.GetViewFrame()->GetBindings().Execute( nSlot, aItems, 0, SFX_CALLMODE_ASYNCHRON ); + mrView.GetViewFrame()->GetBindings().Execute( nSlot, aItems, 0, SfxCallMode::ASYNCHRON ); } break; default: diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index dcc3b9df8960..f95e7f69a862 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -3327,7 +3327,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) RstMBDownFlags(); GetView().GetViewFrame()->GetBindings().Execute( FN_FORMAT_GRAFIC_DLG, 0, 0, - SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + SfxCallMode::RECORD|SfxCallMode::SLOT); return; // double click on OLE object --> OLE-InPlace @@ -3342,7 +3342,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) case nsSelectionType::SEL_FRM: RstMBDownFlags(); GetView().GetViewFrame()->GetBindings().Execute( - FN_FORMAT_FRAME_DLG, 0, 0, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + FN_FORMAT_FRAME_DLG, 0, 0, SfxCallMode::RECORD|SfxCallMode::SLOT); return; case nsSelectionType::SEL_DRW: diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 81a59be3ec6f..676f41d4c364 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -70,7 +70,7 @@ SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings, IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl) { - SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SFX_CALLMODE_ASYNCHRON); + SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON); return 0; } diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 160fb15395bd..def26f114f9d 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1266,7 +1266,7 @@ bool SwFldMgr::InsertFld( { SfxStringItem aFormat(FN_NUMBER_FORMAT, pEntry->GetFormatstring()); pCurShell->GetView().GetViewFrame()->GetDispatcher()-> - Execute(FN_NUMBER_FORMAT, SFX_CALLMODE_SYNCHRON, &aFormat, 0L); + Execute(FN_NUMBER_FORMAT, SfxCallMode::SYNCHRON, &aFormat, 0L); } SfxItemSet aBoxSet( pCurShell->GetAttrPool(), diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index b041797d4e81..ce080774ed7a 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -718,7 +718,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) uno::Reference<linguistic2::XSearchableDictionaryList> xDictionaryList( SvxGetDictionaryList() ); SvxDicListChgClamp aClamp( xDictionaryList ); m_pSh->GetView().GetViewFrame()->GetDispatcher()-> - Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON ); + Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON ); } } else if (nId == MN_IGNORE_SELECTION) diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index ae71c2c8bfd2..fc993a8c32eb 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -111,7 +111,7 @@ void SwModelessRedlineAcceptDlg::Activate() bool bMod = pSh->IsModified(); SfxBoolItem aShow(FN_REDLINE_SHOW, true); pSh->GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L); + FN_REDLINE_SHOW, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aShow, 0L); if (!bMod) pSh->ResetModified(); pImplDlg->Init(); @@ -878,7 +878,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl) { SwView * pView = ::GetActiveView(); pView->GetViewFrame()->GetDispatcher()-> - Execute(SID_UNDO, SFX_CALLMODE_SYNCHRON); + Execute(SID_UNDO, SfxCallMode::SYNCHRON); pTPView->EnableUndo(pView->GetSlotState(SID_UNDO) != 0); Activate(); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 015e0d7231c8..99db68c4c546 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -386,7 +386,7 @@ void SwInputWindow::ApplyFormula() const SfxPoolItem* aArgs[2]; aArgs[0] = &aParam; aArgs[1] = 0; - pView->GetViewFrame()->GetBindings().Execute( FN_EDIT_FORMULA, aArgs, 0, SFX_CALLMODE_ASYNCHRON ); + pView->GetViewFrame()->GetBindings().Execute( FN_EDIT_FORMULA, aArgs, 0, SfxCallMode::ASYNCHRON ); } void SwInputWindow::CancelFormula() @@ -405,7 +405,7 @@ void SwInputWindow::CancelFormula() pView->GetEditWin().GrabFocus(); - pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SFX_CALLMODE_ASYNCHRON); + pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SfxCallMode::ASYNCHRON); } } diff --git a/sw/source/uibase/ribbar/tbxanchr.cxx b/sw/source/uibase/ribbar/tbxanchr.cxx index 1a2d9661d6b2..a251877da573 100644 --- a/sw/source/uibase/ribbar/tbxanchr.cxx +++ b/sw/source/uibase/ribbar/tbxanchr.cxx @@ -118,7 +118,7 @@ void SwTbxAnchor::Click() GetToolBox().EndSelection(); if (nSlotId) - pDispatch->Execute(nSlotId, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + pDispatch->Execute(nSlotId, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 2206bf5bc507..96f521831bb5 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -723,7 +723,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) nGalleryItemType == com::sun::star::gallery::GalleryItemType::MEDIA ) { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); - GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); + GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L ); } } break; @@ -755,7 +755,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) rSh.ChgPageDesc(nCurIdx, aPageDesc); } else - GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_COLUMN_DLG, sal_False); + GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_COLUMN_DLG); } break; case FN_CONVERT_TABLE_TO_TEXT: @@ -2040,7 +2040,7 @@ void SwBaseShell::ExecTxtCtrl( SfxRequest& rReq ) } } else - GetView().GetViewFrame()->GetDispatcher()->Execute( SID_CHAR_DLG, sal_False); + GetView().GetViewFrame()->GetDispatcher()->Execute( SID_CHAR_DLG ); rReq.Done(); } diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index 04e2e13ac28a..7ba6f6d2bba2 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -86,7 +86,7 @@ void SwBezierShell::Execute(SfxRequest &rReq) if (pSh->IsObjSelected()) { if (pSdrView->HasMarkedPoints()) - pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_DELETE, sal_False); + pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_DELETE); else { pSh->DelSelectedObj(); diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx index 468911748c79..548085786df0 100644 --- a/sw/source/uibase/shells/drawdlg.cxx +++ b/sw/source/uibase/shells/drawdlg.cxx @@ -193,7 +193,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) case SID_ATTR_FILL_BITMAP: case SID_ATTR_FILL_TRANSPARENCE: case SID_ATTR_FILL_FLOATTRANSPARENCE: - pDis->Execute(SID_ATTRIBUTES_AREA, sal_False); + pDis->Execute(SID_ATTRIBUTES_AREA); break; case SID_ATTR_LINE_STYLE: case SID_ATTR_LINE_DASH: @@ -202,7 +202,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) case SID_ATTR_LINE_TRANSPARENCE: case SID_ATTR_LINE_JOINT: case SID_ATTR_LINE_CAP: - pDis->Execute(SID_ATTRIBUTES_LINE, sal_False); + pDis->Execute(SID_ATTRIBUTES_LINE); break; } } diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index f3ad3e3762b6..68eb28e6f7f9 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -96,11 +96,11 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) { //remove object -> results in destruction of this! SwView& rTempView = GetView(); - rTempView.GetViewFrame()->GetDispatcher()->Execute(SID_DELETE, SFX_CALLMODE_SYNCHRON ); + rTempView.GetViewFrame()->GetDispatcher()->Execute(SID_DELETE, SfxCallMode::SYNCHRON ); rTempView.StopShellTimer(); //issue a new command to insert the link rTempView.GetViewFrame()->GetDispatcher()->Execute( - SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0); + SID_HYPERLINK_SETLINK, SfxCallMode::ASYNCHRON, &rHLinkItem, 0); } else { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index d501908e2218..51d226e6d134 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -156,7 +156,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) // Frame already exists, open frame dialog for editing. SfxStringItem aDefPage(FN_FORMAT_FRAME_DLG, "columns"); rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_FORMAT_FRAME_DLG, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, + SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aDefPage, 0L ); } @@ -1262,7 +1262,7 @@ void SwFrameShell::ExecDrawAttrArgsTextFrame(SfxRequest& rReq) case SID_ATTR_FILL_TRANSPARENCE: case SID_ATTR_FILL_FLOATTRANSPARENCE: { - pDis->Execute(SID_ATTRIBUTES_AREA, sal_False); + pDis->Execute(SID_ATTRIBUTES_AREA); break; } } diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 1cdd584b1d6b..36078056ed17 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -178,7 +178,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) { rSh.StartAllAction(); rSh.Push(); - rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_TABLE_SELECT_ALL, sal_False ); + rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( FN_TABLE_SELECT_ALL ); } SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); @@ -894,7 +894,7 @@ void SwTableShell::Execute(SfxRequest &rReq) SfxBoolItem aAfter( FN_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ); SfxViewFrame* pVFrame = GetView().GetViewFrame(); if( pVFrame ) - pVFrame->GetDispatcher()->Execute( nDispatchSlot, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aCountItem, &aAfter, 0L); + pVFrame->GetDispatcher()->Execute( nDispatchSlot, SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aCountItem, &aAfter, 0L); } } break; @@ -1017,7 +1017,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_AUTOSUM: { SfxViewFrame* pVFrame = GetView().GetViewFrame(); - pVFrame->GetDispatcher()->Execute(FN_EDIT_FORMULA, SFX_CALLMODE_SYNCHRON); + pVFrame->GetDispatcher()->Execute(FN_EDIT_FORMULA, SfxCallMode::SYNCHRON); const sal_uInt16 nId = SwInputChild::GetChildWindowId(); SwInputChild* pChildWin = (SwInputChild*)pVFrame-> GetChildWindow( nId ); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 024c15c10f87..5dfef0497004 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1255,7 +1255,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case SID_RUBY_DIALOG: case SID_HYPERLINK_DIALOG: { - SfxRequest aReq(nSlot, SFX_CALLMODE_SLOT, SfxGetpApp()->GetPool()); + SfxRequest aReq(nSlot, SfxCallMode::SLOT, SfxGetpApp()->GetPool()); GetView().GetViewFrame()->ExecuteSlot( aReq); rReq.Ignore(); } diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 2748f65f45de..eaec7905f221 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -99,7 +99,7 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) IMPL_LINK(PageColumnControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) { - mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SFX_CALLMODE_ASYNCHRON ); + mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON ); mrPagePropPanel.ClosePageColumnPopup(); return 0; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index fcc9d4523ed5..e1aae308b905 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -292,7 +292,7 @@ void PagePropertyPanel::ExecuteOrientationChange( const bool bLandscape ) mpPageSizeItem->SetSize(Size(nRotatedWidth, nRotatedHeight)); // apply changed attributes - GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), mpPageItem.get(), 0L ); + GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, mpPageSizeItem.get(), mpPageItem.get(), 0L ); } // check, if margin values still fit to the changed page size. @@ -363,7 +363,7 @@ void PagePropertyPanel::ExecuteMarginLRChange( { mpPageLRMarginItem->SetLeft( nPageLeftMargin ); mpPageLRMarginItem->SetRight( nPageRightMargin ); - GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_LRSPACE, SFX_CALLMODE_RECORD, mpPageLRMarginItem.get(), 0L ); + GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_LRSPACE, SfxCallMode::RECORD, mpPageLRMarginItem.get(), 0L ); } void PagePropertyPanel::ExecuteMarginULChange( @@ -372,13 +372,13 @@ void PagePropertyPanel::ExecuteMarginULChange( { mpPageULMarginItem->SetUpper( nPageTopMargin ); mpPageULMarginItem->SetLower( nPageBottomMargin ); - GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SFX_CALLMODE_RECORD, mpPageULMarginItem.get(), 0L ); + GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE_ULSPACE, SfxCallMode::RECORD, mpPageULMarginItem.get(), 0L ); } void PagePropertyPanel::ExecutePageLayoutChange( const bool bMirrored ) { mpPageItem->SetPageUsage( bMirrored ? SVX_PAGE_MIRROR : SVX_PAGE_ALL ); - GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SFX_CALLMODE_RECORD, mpPageItem.get(), 0L ); + GetBindings()->GetDispatcher()->Execute( SID_ATTR_PAGE, SfxCallMode::RECORD, mpPageItem.get(), 0L ); } IMPL_LINK( PagePropertyPanel, ClickMarginHdl, ToolBox*, pToolBox ) @@ -412,7 +412,7 @@ void PagePropertyPanel::ExecuteSizeChange( const Paper ePaper ) } mpPageSizeItem->SetSize( aPageSize ); - mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SFX_CALLMODE_RECORD, mpPageSizeItem.get(), 0L ); + mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, mpPageSizeItem.get(), 0L ); } IMPL_LINK( PagePropertyPanel, ClickSizeHdl, ToolBox*, pToolBox ) @@ -439,7 +439,7 @@ void PagePropertyPanel::ClosePageSizePopup() void PagePropertyPanel::ExecuteColumnChange( const sal_uInt16 nColumnType ) { mpPageColumnTypeItem->SetValue( nColumnType ); - mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SFX_CALLMODE_RECORD, mpPageColumnTypeItem.get(), 0L ); + mpBindings->GetDispatcher()->Execute(SID_ATTR_PAGE_COLUMN, SfxCallMode::RECORD, mpPageColumnTypeItem.get(), 0L ); } IMPL_LINK( PagePropertyPanel, ClickColumnHdl, ToolBox*, pToolBox ) diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 31d6eaba3bb0..84c8db420239 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -166,7 +166,7 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) IMPL_LINK(PageSizeControl, MoreButtonClickHdl_Impl, void *, EMPTYARG) { - mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SFX_CALLMODE_ASYNCHRON ); + mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON ); mrPagePropPanel.ClosePageSizePopup(); return 0; diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 76b9a79dd38b..ed85a1007e29 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -172,7 +172,7 @@ IMPL_LINK(WrapPropertyPanel, WrapTypeHdl, void *, EMPTYARG) nSlot = FN_FRAME_NOWRAP; } SfxBoolItem bStateItem( nSlot, true ); - mpBindings->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_RECORD, &bStateItem, 0L ); + mpBindings->GetDispatcher()->Execute( nSlot, SfxCallMode::RECORD, &bStateItem, 0L ); return 0; } diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx index 1e059856e891..aff345e6ec42 100644 --- a/sw/source/uibase/smartmenu/stmenu.cxx +++ b/sw/source/uibase/smartmenu/stmenu.cxx @@ -134,7 +134,7 @@ sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWi if ( nId == MN_SMARTTAG_OPTIONS ) { SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, true); - mpSwView->GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L ); + mpSwView->GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L ); } if ( nId < MN_ST_INSERT_START) return nId; diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 6370f6085490..68d521d789cd 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -150,7 +150,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) { // select whole table rWrtShell.GetView().GetViewFrame()->GetDispatcher()-> - Execute(FN_TABLE_SELECT_ALL, SFX_CALLMODE_SYNCHRON); + Execute(FN_TABLE_SELECT_ALL, SfxCallMode::SYNCHRON); } if( ! rWrtShell.IsTblComplexForChart()) { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 1f7c255acb94..912be1e4cedf 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -432,7 +432,7 @@ void SwPagePreviewWin::KeyInput( const KeyEvent &rKEvt ) { bHandled = true; mrView.GetViewFrame()->GetDispatcher()->Execute( - nSlot, SFX_CALLMODE_ASYNCHRON ); + nSlot, SfxCallMode::ASYNCHRON ); } } if( !bHandled && !mrView.KeyInput( rKEvt ) ) @@ -495,7 +495,7 @@ void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt ) SfxViewFrame *pTmpFrm = mrView.GetViewFrame(); pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0, - SFX_CALLMODE_ASYNCHRON ); + SfxCallMode::ASYNCHRON ); } else if ( bIsDocPos || bPosInEmptyPage ) { @@ -912,7 +912,7 @@ MOVEPAGE: // print preview is now always in the same frame as the tab view // -> always switch this frame back to normal view // (ScTabViewShell ctor reads stored view data) - GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, 0, 0, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::ASYNCHRON ); break; case FN_INSERT_BREAK: { @@ -924,7 +924,7 @@ MOVEPAGE: SetNewPage( nSelPage ); SfxViewFrame *pTmpFrm = GetViewFrame(); pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0, - SFX_CALLMODE_ASYNCHRON ); + SfxCallMode::ASYNCHRON ); } break; default: diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 1b93bc50cae4..7be4f15c7efd 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -964,7 +964,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // Update all tables if necessary: if( m_pWrtShell->GetDoc()->IsUpdateTOX() ) { - SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); + SfxRequest aSfxRequest( FN_UPDATE_TOX, SfxCallMode::SLOT, GetPool() ); Execute( aSfxRequest ); m_pWrtShell->GetDoc()->SetUpdateTOX( false ); // reset again m_pWrtShell->SttEndDoc(true); @@ -993,7 +993,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) !pVFrame->GetChildWindow( SID_NAVIGATOR )) { SfxBoolItem aNavi(SID_NAVIGATOR, true); - GetDispatcher().Execute(SID_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aNavi, 0L); + GetDispatcher().Execute(SID_NAVIGATOR, SfxCallMode::ASYNCHRON, &aNavi, 0L); } uno::Reference< frame::XFrame > xFrame = pVFrame->GetFrame().GetFrameInterface(); @@ -1643,7 +1643,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadonly); - GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON, + GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::ASYNCHRON, &aItem, 0L ); } break; @@ -1656,7 +1656,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) GetFormShell()->SetView( PTR_CAST(FmFormView, GetWrtShell().GetDrawView()) ); SfxBoolItem aItem( SID_FM_DESIGN_MODE, !GetDocShell()->IsReadOnly()); - GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON, + GetDispatcher().Execute( SID_FM_DESIGN_MODE, SfxCallMode::SYNCHRON, &aItem, 0L ); } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index f2f68a9eedf8..cbb7a88ff7fb 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -700,7 +700,7 @@ void SwView::Execute(SfxRequest &rReq) } } // Go to next change after accepting or rejecting one (fdo#83953) - GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(FN_REDLINE_NEXT_CHANGE, SfxCallMode::ASYNCHRON); } break; @@ -863,7 +863,7 @@ void SwView::Execute(SfxRequest &rReq) else { SfxBoolItem aItem( SID_WIN_FULLSCREEN, false ); - GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SFX_CALLMODE_RECORD, &aItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SfxCallMode::RECORD, &aItem, 0L ); bIgnore = true; } } @@ -908,7 +908,7 @@ void SwView::Execute(SfxRequest &rReq) case FN_EDIT_CURRENT_TOX: { GetViewFrame()->GetDispatcher()->Execute( - FN_INSERT_MULTI_TOX, SFX_CALLMODE_ASYNCHRON); + FN_INSERT_MULTI_TOX, SfxCallMode::ASYNCHRON); } break; case FN_UPDATE_CUR_TOX: @@ -1235,12 +1235,12 @@ void SwView::Execute(SfxRequest &rReq) { SfxAllEnumItem aEnumItem(SID_OBJECT_ALIGN, nAlias - SID_OBJECT_ALIGN_LEFT); GetViewFrame()->GetDispatcher()->Execute( - SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0L); + SID_OBJECT_ALIGN, SfxCallMode::ASYNCHRON, &aEnumItem, 0L); } else if(nAlias) //these slots are either re-mapped to text or object alignment GetViewFrame()->GetDispatcher()->Execute( - nAlias, SFX_CALLMODE_ASYNCHRON); + nAlias, SfxCallMode::ASYNCHRON); } break; case SID_RESTORE_EDITING_VIEW: @@ -1646,14 +1646,14 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) case FN_STAT_PAGE: { GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON|SfxCallMode::RECORD ); } break; case FN_STAT_WORDCOUNT: { GetViewFrame()->GetDispatcher()->Execute(FN_WORDCOUNT_DIALOG, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON|SfxCallMode::RECORD ); } break; @@ -1680,7 +1680,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) case FN_STAT_TEMPLATE: { GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_PAGE_DLG, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON|SfxCallMode::RECORD ); } break; case SID_ATTR_ZOOM: @@ -1818,7 +1818,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) } if( nId ) GetViewFrame()->GetDispatcher()->Execute(nId, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD ); } break; @@ -2228,7 +2228,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe // update all "table of ..." sections if needed if( m_pWrtShell->IsUpdateTOX() ) { - SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); + SfxRequest aReq( FN_UPDATE_TOX, SfxCallMode::SLOT, GetPool() ); Execute( aReq ); m_pWrtShell->SetUpdateTOX( false ); // reset } @@ -2355,7 +2355,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) if(bCallAddressPilot) { GetViewFrame()->GetDispatcher()->Execute( - SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON); + SID_ADDRESS_DATA_SOURCE, SfxCallMode::SYNCHRON); if ( lcl_NeedAdditionalDataSource( xDBContext ) ) // no additional data source has been created // -> assume that the user has cancelled the pilot @@ -2372,7 +2372,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) //then show the "Data base only" field dialog SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, true); pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY, - SFX_CALLMODE_SYNCHRON, &aOn, 0L); + SfxCallMode::SYNCHRON, &aOn, 0L); return; } else diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx index 15cc3e47b47c..2a4c521e214c 100644 --- a/sw/source/uibase/uiview/viewcoll.cxx +++ b/sw/source/uibase/uiview/viewcoll.cxx @@ -20,6 +20,7 @@ #include "cmdid.h" #include "uiitems.hxx" #include <vcl/window.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> @@ -56,7 +57,7 @@ void SwView::ExecColl(SfxRequest &rReq) SfxUInt16Item aFamItem( SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PAGE); SwPtrItem aShell(FN_PARAM_WRTSHELL, GetWrtShellPtr()); - SfxRequest aReq(SID_STYLE_APPLY, 0, GetPool()); + SfxRequest aReq(SID_STYLE_APPLY, SfxCallMode::SLOT, GetPool()); aReq.AppendItem(aName); aReq.AppendItem(aFamItem); aReq.AppendItem(aShell); @@ -66,7 +67,7 @@ void SwView::ExecColl(SfxRequest &rReq) } else { - SfxRequest aReq(FN_FORMAT_PAGE_DLG, 0, GetPool()); + SfxRequest aReq(FN_FORMAT_PAGE_DLG, SfxCallMode::SLOT, GetPool()); GetCurShell()->ExecuteSlot(aReq); } } diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 14c416f706d3..52929b13c4c3 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -722,7 +722,7 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo) { if (pInfo->nCommand == SPELLCMD_STARTSPELLDLG) - GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); return 0; } diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 2082a43a5b41..a8043956e0d3 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -442,7 +442,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext ) if(rSh.HasSelection() && !bNext == rSh.IsCrsrPtAtEnd()) rSh.SwapPam(); m_pSrchItem->SetBackward(!bNext); - SfxRequest aReq(FN_REPEAT_SEARCH, SFX_CALLMODE_SLOT, pThis->GetPool()); + SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, pThis->GetPool()); pThis->ExecSearch(aReq); m_pSrchItem->SetBackward(bBackward); } @@ -545,7 +545,7 @@ IMPL_LINK( SwView, ExecRulerClick, Ruler *, pRuler ) SfxStringItem aDefPage(SID_PARA_DLG, sDefPage); GetViewFrame()->GetDispatcher()->Execute( SID_PARA_DLG, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, + SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aDefPage, 0L ); return 0; } diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 4f576a0ecf14..3d64f8b8b834 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -170,7 +170,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) SfxStringItem aPrinterName(SID_PRINTER_NAME, sFaxName); SfxBoolItem aSilent( SID_SILENT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_PRINTDOC, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, + SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aPrinterName, &aSilent, 0L ); } else @@ -181,7 +181,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) aInfoBox.Execute(); SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE); GetViewFrame()->GetDispatcher()->Execute(SID_SW_EDITOPTIONS, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, + SfxCallMode::SYNCHRON|SfxCallMode::RECORD, &aDefPage, 0L ); } } @@ -208,7 +208,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) { SfxBoolItem aBool(FN_QRY_MERGE, true); GetViewFrame()->GetDispatcher()->Execute( - FN_QRY_MERGE, SFX_CALLMODE_ASYNCHRON, &aBool, 0L); + FN_QRY_MERGE, SfxCallMode::ASYNCHRON, &aBool, 0L); rReq.Ignore(); return; } diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index e02b0a9805b8..8ec7d51eea4d 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -230,7 +230,7 @@ void SwXDispatch::dispatch(const util::URL& aURL, SfxUsrAnyItem aDBProperties(FN_PARAM_DATABASE_PROPERTIES, uno::makeAny(aArgs)); m_pView->GetViewFrame()->GetDispatcher()->Execute( FN_MAILMERGE_WIZARD, - SFX_CALLMODE_ASYNCHRON, + SfxCallMode::ASYNCHRON, &aDBProperties, 0L); } #endif diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index a4d2652d5b77..62a899747808 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -70,7 +70,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons aState = frame::DispatchResultState::FAILURE; else { - SfxRequest aReq( pSlot, aArgs, SFX_CALLMODE_SYNCHRON, SW_MOD()->GetPool() ); + SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SW_MOD()->GetPool() ); const SfxPoolItem* pResult = SW_MOD()->ExecuteSlot( aReq ); if ( pResult ) aState = frame::DispatchResultState::SUCCESS; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 09e5c9ace00e..bf543d10ed45 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1143,7 +1143,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption if(IsValid()) { SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, 7 ); - SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SFX_CALLMODE_SYNCHRON, + SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SfxCallMode::SYNCHRON, pDocShell->GetDoc()->GetAttrPool()); aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); @@ -1918,7 +1918,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& { sal_Int16 nYear = 0; aValue >>= nYear; - SfxRequest aRequest ( SID_ATTR_YEAR2000, SFX_CALLMODE_SLOT, pDocShell->GetDoc()->GetAttrPool()); + SfxRequest aRequest ( SID_ATTR_YEAR2000, SfxCallMode::SLOT, pDocShell->GetDoc()->GetAttrPool()); aRequest.AppendItem(SfxUInt16Item( SID_ATTR_YEAR2000, static_cast < sal_uInt16 > ( nYear ) ) ); pDocShell->Execute ( aRequest ); } diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index ec9e9402deaf..f5600e450691 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -1332,7 +1332,7 @@ sal_Bool SwXTextViewCursor::screenDown() bool bRet = false; if(m_pView) { - SfxRequest aReq(FN_PAGEDOWN, SFX_CALLMODE_SLOT, m_pView->GetPool()); + SfxRequest aReq(FN_PAGEDOWN, SfxCallMode::SLOT, m_pView->GetPool()); m_pView->Execute(aReq); const SfxPoolItem* pRet = aReq.GetReturnValue(); bRet = pRet && ((const SfxBoolItem*)pRet)->GetValue(); @@ -1349,7 +1349,7 @@ sal_Bool SwXTextViewCursor::screenUp() bool bRet = false; if(m_pView) { - SfxRequest aReq(FN_PAGEUP, SFX_CALLMODE_SLOT, m_pView->GetPool()); + SfxRequest aReq(FN_PAGEUP, SfxCallMode::SLOT, m_pView->GetPool()); m_pView->Execute(aReq); const SfxPoolItem* pRet = aReq.GetReturnValue(); bRet = pRet && ((const SfxBoolItem*)pRet)->GetValue(); diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index f64ae4eb702e..e4e5c90c0342 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -117,7 +117,7 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt ) { SfxUInt16Item aBookmark( FN_STAT_BOOKMARK, aBookmarkIdx[nCurrId] ); SfxViewFrame::Current()->GetDispatcher()->Execute( FN_STAT_BOOKMARK, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON|SfxCallMode::RECORD, &aBookmark, 0L ); } } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 3d47d913ce6e..d00b0b9b360a 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3199,7 +3199,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, (void*)pBase); pActiveShell->GetView().GetViewFrame()-> GetDispatcher()->Execute(FN_INSERT_MULTI_TOX, - SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0L); + SfxCallMode::ASYNCHRON, &aPtrItem, 0L); } break; @@ -3238,7 +3238,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) } if(nSlot) pActiveShell->GetView().GetViewFrame()-> - GetDispatcher()->Execute(nSlot, SFX_CALLMODE_ASYNCHRON); + GetDispatcher()->Execute(nSlot, SfxCallMode::ASYNCHRON); else if(xNameAccess.is()) { uno::Any aObj = xNameAccess->getByName(pCnt->GetName()); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 39ad2e55e56f..e3ac3aab85f9 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -838,7 +838,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry { SfxStringItem aName(FN_EDIT_REGION, pCont->GetSection()->GetSectionName()); - rDispatch.Execute(FN_EDIT_REGION, SFX_CALLMODE_ASYNCHRON, &aName, 0L); + rDispatch.Execute(FN_EDIT_REGION, SfxCallMode::ASYNCHRON, &aName, 0L); } } break; @@ -922,7 +922,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry const SfxFrameItem* pItem = (SfxFrameItem*) rDispatch.Execute(SID_NEWDOCDIRECT, - SFX_CALLMODE_SYNCHRON, &aFactory, 0L); + SfxCallMode::SYNCHRON, &aFactory, 0L); // save at SfxFrame* pFrm = pItem ? pItem->GetFrame() : 0; @@ -931,7 +931,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry { const SfxBoolItem* pBool = (const SfxBoolItem*) pFrame->GetDispatcher()->Execute( - SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON ); + SID_SAVEASDOC, SfxCallMode::SYNCHRON ); SfxObjectShell& rObj = *pFrame->GetObjectShell(); const SfxMedium* pMedium = rObj.GetMedium(); OUString sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI)); @@ -961,7 +961,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry } else pFrame->GetDispatcher()->Execute(SID_CLOSEWIN, - SFX_CALLMODE_SYNCHRON); + SfxCallMode::SYNCHRON); } else { @@ -1184,7 +1184,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) SfxStringItem aTargetFrameName( SID_TARGETNAME, "_blank" ); SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> - Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, + Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON, &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0L); } } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 47f9dcc9bfc0..c5bf16abc16c 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1215,7 +1215,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) SfxLinkItem aLink( SID_DONELINK, LINK( this, SwNavigationPI, DoneLink ) ); GetActiveView()->GetViewFrame()->GetDispatcher()->Execute( - SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, + SID_OPENDOC, SfxCallMode::ASYNCHRON, &aFileItem, &aOptionsItem, &aLink, 0L ); } } diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 29a3f0c0283d..a22c112f24c8 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -123,7 +123,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) SfxStringItem aStyle( FN_SET_PAGE_STYLE, pStyle->GetName() ); pWrtShell->GetView().GetViewFrame()->GetDispatcher()->Execute( FN_SET_PAGE_STYLE, - SFX_CALLMODE_SLOT|SFX_CALLMODE_RECORD, + SfxCallMode::SLOT|SfxCallMode::RECORD, &aStyle, 0L ); } } diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index cf394fb00d32..484a551c6747 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -258,7 +258,7 @@ bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* p GetWin()->Update(); if(RET_YES == nRet) { - GetView().GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FIELD, SFX_CALLMODE_SYNCHRON); + GetView().GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FIELD, SfxCallMode::SYNCHRON); } return bRet; } @@ -340,7 +340,7 @@ void SwWrtShell::ClickToField( const SwField& rFld ) //#97295# immediately select the right shell GetView().StopShellTimer(); GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON|SfxCallMode::RECORD ); EndUndo( UNDO_END ); } } @@ -499,8 +499,8 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, 0L }; - pViewFrm->GetDispatcher()->GetBindings()->Execute( SID_OPENDOC, aArr, - SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD ); + pViewFrm->GetDispatcher()->GetBindings()->Execute( SID_OPENDOC, aArr, 0, + SfxCallMode::ASYNCHRON|SfxCallMode::RECORD ); } void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, |