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 /sd/source/ui | |
| 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 'sd/source/ui')
70 files changed, 172 insertions, 171 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 96465a4ff93a..51fda0c8cb93 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1834,7 +1834,7 @@ void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTarge aTargets.insert( aTargets.end(), rTargets.begin(), rTargets.end() ); Sequence< Any > aTargetSequence( comphelper::containerToSequence( aTargets ) ); const SfxUnoAnyItem aItem( SID_ADD_MOTION_PATH, Any( aTargetSequence ) ); - pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON, &aItem, 0 ); + pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSID, SfxCallMode::ASYNCHRON, &aItem, 0 ); } } } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index a93091e8c56c..0899fffcaa8f 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -465,7 +465,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) { if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) ) { - mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_EDIT, SFX_CALLMODE_ASYNCHRON); + mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_BEZIER_EDIT, SfxCallMode::ASYNCHRON); return true; } else if( rMEvt.IsLeft() ) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index e853d6fda758..9c1a84b93592 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1004,19 +1004,19 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation case SID_REPLYTO_POSTIT: { const SfxUnoAnyItem aItem( SID_REPLYTO_POSTIT, Any( xAnnotation ) ); - pDispatcher->Execute( SID_REPLYTO_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 ); + pDispatcher->Execute( SID_REPLYTO_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 ); break; } case SID_DELETE_POSTIT: { const SfxUnoAnyItem aItem( SID_DELETE_POSTIT, Any( xAnnotation ) ); - pDispatcher->Execute( SID_DELETE_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 ); + pDispatcher->Execute( SID_DELETE_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 ); break; } case SID_DELETEALLBYAUTHOR_POSTIT: { const SfxStringItem aItem( SID_DELETEALLBYAUTHOR_POSTIT, sAuthor ); - pDispatcher->Execute( SID_DELETEALLBYAUTHOR_POSTIT, SFX_CALLMODE_ASYNCHRON, &aItem, 0 ); + pDispatcher->Execute( SID_DELETEALLBYAUTHOR_POSTIT, SfxCallMode::ASYNCHRON, &aItem, 0 ); break; } case SID_DELETEALL_POSTIT: diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 77a34765c753..1af99370d306 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -458,7 +458,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume return; pViewFrame->GetDispatcher()->Execute(SID_SUMMARY_PAGE, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD); OSL_ASSERT (pDocument!=NULL); @@ -601,7 +601,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) } else { - SfxRequest aRequest (SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool()); + SfxRequest aRequest (SID_OPENDOC, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool()); aRequest.AppendItem (aFile); aRequest.AppendItem (aReferer); // Put the password into the request @@ -685,7 +685,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty); SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE ); pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aIsChangedItem, &eAutoLayout, 0L); } // clear document info @@ -895,7 +895,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher()) { - pViewFrame->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + pViewFrame->GetDispatcher()->Execute(SID_SIZE_PAGE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD); } } diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 30f0b8b1eeb0..c494cdce10a2 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -120,7 +120,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) { SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PK_STANDARD); SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME, pMaster->GetName() ); - pViewFrame->GetDispatcher()->Execute(SID_PRESENTATION_LAYOUT,SFX_CALLMODE_SLOT, &aStyle, 0L ); + pViewFrame->GetDispatcher()->Execute(SID_PRESENTATION_LAYOUT,SfxCallMode::SLOT, &aStyle, 0L ); pViewFrame->GetBindings().Invalidate(SID_PRESENTATION_LAYOUT); pViewFrame->GetBindings().Invalidate(SID_STATUS_LAYOUT); } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index b0e27296ce9f..98df417636ce 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -62,7 +62,7 @@ LayerTabBar::~LayerTabBar() void LayerTabBar::Select() { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON); + pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::ASYNCHRON); } void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) @@ -77,7 +77,7 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) if (aLayerId == 0) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute(SID_INSERTLAYER, SFX_CALLMODE_SYNCHRON); + pDispatcher->Execute(SID_INSERTLAYER, SfxCallMode::SYNCHRON); bSetPageID=true; } @@ -103,7 +103,7 @@ void LayerTabBar::DoubleClick() if (GetCurPageId() != 0) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute( SID_MODIFYLAYER, SFX_CALLMODE_SYNCHRON ); + pDispatcher->Execute( SID_MODIFYLAYER, SfxCallMode::SYNCHRON ); } } @@ -283,7 +283,7 @@ void LayerTabBar::ActivatePage() { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON); + pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::ASYNCHRON); } } diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 3dd4c0188ef0..480a5f74e0e7 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -39,7 +39,7 @@ void RequestNavigatorUpdate (SfxBindings* pBindings) SfxBoolItem aItem (SID_NAVIGATOR_INIT, true); pBindings->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L); } diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index c535d04f6c60..daf0aaaa4541 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -85,7 +85,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) SfxBoolItem aItem (SID_SPELL_DIALOG, false); GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, - SFX_CALLMODE_ASYNCHRON, + SfxCallMode::ASYNCHRON, &aItem, 0L); } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 2e9764b49efa..f8db33ebe451 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -397,7 +397,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) SfxBoolItem aItem( SID_ANIMATOR_ADD, true ); GetBindings().GetDispatcher()->Execute( - SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); return( 0L ); } @@ -482,7 +482,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) SfxBoolItem aItem( SID_ANIMATOR_CREATE, true ); GetBindings().GetDispatcher()->Execute( - SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); return( 0L ); } @@ -776,7 +776,7 @@ bool AnimationWindow::Close() SfxBoolItem aItem( SID_ANIMATION_OBJECTS, false ); GetBindings().GetDispatcher()->Execute( - SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_ANIMATION_OBJECTS, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); SfxDockingWindow::Close(); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index b5c6d0852183..08eb6f324d3c 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1468,7 +1468,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) } else { - SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() ); + SfxRequest aReq( SID_OPENDOC, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() ); aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, OUString() ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 34d3c48c8a92..b9aa3f5ea1a3 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) { SfxBoolItem aItem( nSId, true ); mpBindings->GetDispatcher()->Execute( - nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L ); + nSId, SfxCallMode::SLOT |SfxCallMode::RECORD, &aItem, 0L ); } } break; @@ -292,7 +292,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) { SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage ); mpBindings->GetDispatcher()->Execute( - SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); } } break; @@ -396,7 +396,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) { SfxStringItem aItem( SID_NAVIGATOR_OBJECT, aStr ); mpBindings->GetDispatcher()->Execute( - SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_NAVIGATOR_OBJECT, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); //set sign variable maTlbObjects.MarkCurEntry(aStr); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 7ad69b81e96d..628b66f303af 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -910,7 +910,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) GetFrameView()->SetPageKind(eNewPageKind); ( ( mpViewShell && mpViewShell->GetViewFrame() ) ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )-> - GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); + GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD ); // The current ViewShell changed pDrViewSh = (DrawViewShell*) mpViewShell; @@ -1014,7 +1014,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) GetFrameView()->SetPageKind(eNewPageKind); ( ( mpViewShell && mpViewShell->GetViewFrame() ) ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )-> - GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); + GetDispatcher()->Execute( SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD ); // The current ViewShell changed pDrViewSh = (DrawViewShell*) mpViewShell; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 0b9e31c4cb69..a46ec7c0a2e9 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -199,7 +199,7 @@ DrawDocShell::~DrawDocShell() if( pFrame ) pFrame->GetDispatcher()->Execute( - SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L); + SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L); } void DrawDocShell::GetState(SfxItemSet &rSet) diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 681096330b45..d8685cb78764 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -353,7 +353,7 @@ bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn; if (!bPermanent) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return bReturn; } diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 7f57ddf53224..312e32f5b0bf 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -156,7 +156,7 @@ bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; if (!bPermanent && bCreated) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return bReturn; } diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index bf74e9c2414b..8b1ebdcf5a10 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -210,7 +210,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if ((!bPermanent && bCreated) || bDeleted) { - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } return(bReturn); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index eeaf6485ce1f..a17388a067a1 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -159,7 +159,7 @@ bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; if (!bPermanent) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return bReturn; } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 3ed1773d8790..ec44ea456fae 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -262,7 +262,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; if (!bPermanent) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return bReturn; } diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 50e5c9bee598..a6842ba07f13 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -178,7 +178,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) mpView->MarkObj(aPnt, nHitLog); } - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } else if (rMEvt.IsLeft() && !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !bSelectionChanged && diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 65a09c5824f9..ae6ee9706997 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -113,7 +113,7 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn); if (!bPermanent) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return (bReturn); } diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index e9e3e5a9bf32..e8eaec958789 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -74,7 +74,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) mpViewShell->SetStartShowWithDialog(); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } } } diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 53e64fd9ff12..219cd6e52fc6 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -430,7 +430,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) // Switch to FuSelect. mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); // changeover to the next object if(!mpView->MarkNextObj( !aCode.IsShift() )) @@ -765,7 +765,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) { mpViewShell->GetViewFrame()-> GetDispatcher()->Execute( SID_INSERT_GRAPHIC, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } else if ( ( pObj->ISA(SdrTextObj) || pObj->ISA(SdrObjGroup) ) && !SD_MOD()->GetWaterCan() && @@ -774,8 +774,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) { SfxUInt16Item aItem(SID_TEXTEDIT, 2); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_TEXTEDIT, SFX_CALLMODE_ASYNCHRON | - SFX_CALLMODE_RECORD, &aItem, 0L); + Execute(SID_TEXTEDIT, SfxCallMode::ASYNCHRON | + SfxCallMode::RECORD, &aItem, 0L); } else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRUP) { @@ -786,7 +786,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) } } else - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } bool FuDraw::RequestHelp(const HelpEvent& rHEvt) @@ -1025,7 +1025,7 @@ bool FuDraw::cancel() // Switch to FuSelect. mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); bReturn = true; } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 6df9b36fcb41..dc349d837c6a 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -254,7 +254,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) delete pOutl; - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_DELETE_PAGE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_DELETE_PAGE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD); } } diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index dcf5ad77ecd5..2eaa074da246 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -81,7 +81,7 @@ void FuFormatPaintBrush::implcancel() { SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame(); pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); - pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } } diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 0e2512f3a68e..1040ab1e7b2c 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -154,14 +154,14 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if ( rMEvt.IsMod1() ) { // open in new frame - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L); } else { // open in current frame SfxFrameItem aFrameItem( SID_DOCFRAME, pFrame ); - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } } diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 53f901639a85..66f6484607cf 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -237,13 +237,13 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->MarkObj(pCandidate, mpView->GetSdrPageView()); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON); + SID_ATTR_CHAR, SfxCallMode::ASYNCHRON); } else { // insert a new page with the same page layout mpViewShell->GetViewFrame()->GetDispatcher()->Execute( - SID_INSERTPAGE_QUICK, SFX_CALLMODE_ASYNCHRON); + SID_INSERTPAGE_QUICK, SfxCallMode::ASYNCHRON); } // consumed @@ -267,11 +267,11 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) } else if( pObj && pObj->IsEmptyPresObj() && pObj->ISA( SdrGrafObj ) ) { - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_GRAPHIC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_GRAPHIC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } else { - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } // consumed @@ -352,7 +352,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // zoom to page mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); bReturn = true; } } @@ -364,7 +364,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // zoom to selected objects mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + Execute(SID_SIZE_OPTIMAL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); bReturn = true; } } @@ -823,7 +823,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, - SFX_CALLMODE_ASYNCHRON, + SfxCallMode::ASYNCHRON, &aInputString, 0L); @@ -874,7 +874,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, - SFX_CALLMODE_ASYNCHRON, + SfxCallMode::ASYNCHRON, &aInputString, 0L); @@ -1124,7 +1124,7 @@ bool FuPoor::cancel() { if ( !this->ISA(FuSelection) ) { - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); return true; } diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 283916836247..11f1237cb07e 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -229,7 +229,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) } // force update of TabBar - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_MASTERPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_MASTERPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } else { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 05ae58801ad4..8b3269c3e34e 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -160,17 +160,17 @@ void FuScale::DoExecute( SfxRequest& rReq ) { // name confusion: SID_SIZE_ALL -> zoom onto all objects // --> the program offers it as optimal - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } } break; case SVX_ZOOM_PAGEWIDTH: - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); break; case SVX_ZOOM_WHOLEPAGE: - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); break; default: break; diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 0b0c1d41eb47..51d134e60364 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -251,8 +251,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) SfxUInt16Item aItem(SID_TEXTEDIT, 1); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON | - SFX_CALLMODE_RECORD, &aItem, 0L); + Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON | + SfxCallMode::RECORD, &aItem, 0L); return bReturn; // CAUTION, due to the synchronous slot the object is deleted now } } @@ -269,14 +269,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (rMEvt.IsMod1()) { // Open in new frame - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L); } else { // Open in current frame SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } @@ -754,7 +754,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if( rMEvt.IsRight() ) { // In watering-can mode, on press onto right mouse button, a undo is executed - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_UNDO, SFX_CALLMODE_ASYNCHRON ); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_UNDO, SfxCallMode::ASYNCHRON ); } else if (pWaterCanCandidate != NULL) { @@ -823,7 +823,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pHdl = NULL; mpWindow->ReleaseMouse(); FuDraw::MouseButtonUp(rMEvt); - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SYNCHRON); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::SYNCHRON); return bReturn; // CAUTION, due to the synchronous slot, the object is deleted now. } @@ -988,7 +988,7 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) { mpView->ResetCreationActive(); - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } } @@ -1235,7 +1235,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxBoolItem aBrowseItem( SID_BROWSE, true ); mpWindow->ReleaseMouse(); pFrame->GetDispatcher()-> - Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); bAnimated = true; @@ -1259,7 +1259,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) // Jump to Bookmark (Page or Object) SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark()); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); + Execute(SID_NAVIGATOR_OBJECT, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L); bAnimated = true; } break; @@ -1276,7 +1276,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); SfxBoolItem aBrowseItem( SID_BROWSE, true ); pFrame->GetDispatcher()-> - Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } @@ -1289,7 +1289,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) // Jump to the previous page SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_PREVIOUS); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L); bAnimated = true; } @@ -1300,7 +1300,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) // Jump to the next page SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_NEXT); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L); bAnimated = true; } @@ -1311,7 +1311,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) // Jump to the first page SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_FIRST); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L); bAnimated = true; } @@ -1322,7 +1322,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) // Jump to the last page SfxUInt16Item aItem(SID_NAVIGATOR_PAGE, PAGE_LAST); mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + Execute(SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L); bAnimated = true; } @@ -1367,7 +1367,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) pViewFrm->GetDispatcher()->Execute( SID_OPENDOC, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aUrl, &aBrowsing, 0L ); @@ -1469,7 +1469,7 @@ bool FuSelection::cancel() if (mpView->Is3DRotationCreationActive()) { mpView->ResetCreationActive(); - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); return true; } else diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index bdb8fe32bfbe..8d1f439bf4ca 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -268,7 +268,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) // we switch explicitly into selection mode mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } else diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 669cead02abb..d4aa31ac756a 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -342,14 +342,14 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (rMEvt.IsMod1()) { // open in new frame - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aBrowseItem, &aReferer, 0L); } else { // open in current frame SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - pFrame->GetDispatcher()->Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pFrame->GetDispatcher()->Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } } @@ -873,7 +873,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } } if (bJustEndedEdit) diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx index ec65cc044498..7533ce194056 100644 --- a/sd/source/ui/func/undoheaderfooter.cxx +++ b/sd/source/ui/func/undoheaderfooter.cxx @@ -42,13 +42,13 @@ SdHeaderFooterUndoAction::~SdHeaderFooterUndoAction() void SdHeaderFooterUndoAction::Undo() { mpPage->setHeaderFooterSettings( maOldSettings ); - SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } void SdHeaderFooterUndoAction::Redo() { mpPage->setHeaderFooterSettings( maNewSettings ); - SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 4e15c5c56abd..283724b136a4 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -331,7 +331,7 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) { pDispatcher->Execute( SID_INSERTPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, *aRequest.GetArgs()); } UpdateSelection(); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 247e9f55ef1b..9b708235b58d 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -325,7 +325,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) if (pDispatcher != NULL) { sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId(); - pDispatcher->Execute(SID_MASTERPAGE, SFX_CALLMODE_SYNCHRON); + pDispatcher->Execute(SID_MASTERPAGE, SfxCallMode::SYNCHRON); PreviewValueSet::SelectItem (nIndex); mrBase.GetDrawController().setCurrentPage(xSelectedMaster); } diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 7f72a3c0ce6d..a4757d70d76e 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -138,7 +138,7 @@ void SlideShowRestarter::StartPresentation (void) // Start the slide show on the saved current slide. if (mpDispatcher != NULL) { - mpDispatcher->Execute(SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON); + mpDispatcher->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON); if (mpSlideShow.is()) { Sequence<css::beans::PropertyValue> aProperties (1); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 4704c9040da1..1281111ce1cc 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -733,7 +733,7 @@ void SAL_CALL SlideshowImpl::disposing() if( mpViewShell->IsStartShowWithDialog() && getDispatcher() ) { mpViewShell->SetStartShowWithDialog( false ); - getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } mpViewShell->GetViewShellBase().UpdateBorder(true); @@ -1568,7 +1568,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) pViewFrm->GetDispatcher()->Execute( SID_OPENDOC, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aUrl, &aBrowsing, 0L ); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 9ebfd1e56fa8..0a78e7e84f0c 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -151,7 +151,7 @@ void SlideSorterController::Init (void) // Create the selection function. SfxRequest aRequest ( SID_OBJECT_SELECT, - 0, + SfxCallMode::SLOT, mrModel.GetDocument()->GetItemPool()); mrSlideSorter.SetCurrentFunction(CreateSelectionFunction(aRequest)); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 6f66ccd60261..e8577b918a57 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -411,7 +411,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { pViewShell->GetDispatcher()->Execute( SID_INSERTPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } bResult = true; } @@ -1133,7 +1133,7 @@ bool NormalModeHandler::ProcessButtonDownEvent ( mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( SID_INSERTPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); break; } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index dba3fa2cf7b7..331210a48e7d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1029,7 +1029,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( - SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); } return bSuccess; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 4776edf2aa6d..629556dfbb68 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -189,7 +189,7 @@ void TableDesignWidget::ApplyStyle() { if( pView ) { - SfxRequest aReq( SID_TABLE_STYLE, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() ); + SfxRequest aReq( SID_TABLE_STYLE, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() ); aReq.AppendItem( SfxStringItem( SID_TABLE_STYLE, sStyleName ) ); rtl::Reference< sdr::SelectionController > xController( pView->getSelectionController() ); @@ -208,7 +208,7 @@ void TableDesignWidget::ApplyStyle() { SfxDispatcher* pDispatcher = getDispatcher( mrBase ); SfxStringItem aArg( SID_TABLE_STYLE, sStyleName ); - pDispatcher->Execute(SID_INSERT_TABLE, SFX_CALLMODE_ASYNCHRON, &aArg, 0 ); + pDispatcher->Execute(SID_INSERT_TABLE, SfxCallMode::ASYNCHRON, &aArg, 0 ); } } catch( Exception& ) @@ -238,7 +238,7 @@ void TableDesignWidget::ApplyOptions() if( mxSelectedTable.is() ) { - SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SFX_CALLMODE_SYNCHRON, SfxGetpApp()->GetPool() ); + SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SfxCallMode::SYNCHRON, SfxGetpApp()->GetPool() ); for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i ) { diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 29085e674c23..0c07056be177 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -478,7 +478,7 @@ void SdUnoDrawView::SetZoom( sal_Int16 nZoom ) SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); if( pDispatcher ) { - pDispatcher->Execute(SID_ATTR_ZOOM,SFX_CALLMODE_SYNCHRON,&aZoomItem, 0L); + pDispatcher->Execute(SID_ATTR_ZOOM,SfxCallMode::SYNCHRON,&aZoomItem, 0L); } } } @@ -528,7 +528,7 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) return; } SvxZoomItem aZoomItem( eZoomType ); - pDispatcher->Execute(SID_ATTR_ZOOM,SFX_CALLMODE_SYNCHRON,&aZoomItem, 0L); + pDispatcher->Execute(SID_ATTR_ZOOM,SfxCallMode::SYNCHRON,&aZoomItem, 0L); } } } diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index ca507c2fe1f9..b62456ea3d8c 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -70,7 +70,7 @@ void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, cons aState = frame::DispatchResultState::FAILURE; else { - SfxRequest aReq( pSlot, aArgs, SFX_CALLMODE_SYNCHRON, SD_MOD()->GetPool() ); + SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SD_MOD()->GetPool() ); const SfxPoolItem* pResult = SD_MOD()->ExecuteSlot( aReq ); if ( pResult ) aState = frame::DispatchResultState::SUCCESS; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 7a25bcdd88b9..f40af072005f 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -318,7 +318,7 @@ void Outliner::EndSpelling (void) // Make FuSelection the current function. pViewShell->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD); // Remove and, if previously created by us, delete the outline // view. @@ -1292,8 +1292,8 @@ void Outliner::EnterEditMode (bool bGrabFocus) SfxUInt16Item aItem (SID_TEXTEDIT, 1); ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); pViewShell->GetDispatcher()-> - Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON | - SFX_CALLMODE_RECORD, &aItem, 0L); + Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON | + SfxCallMode::RECORD, &aItem, 0L); // To be consistent with the usual behaviour in the Office the text // object that is put into edit mode would have also to be selected. diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index a5d7527c4c00..63d89849de5a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -407,7 +407,7 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if( GetViewFrame() ) { GetViewFrame()->GetDispatcher()->Execute( - SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON ); + SID_PRESENTATION, SfxCallMode::ASYNCHRON ); } } break; @@ -909,7 +909,7 @@ OUString ViewShellBase::GetInitialViewShellType (void) void ViewShellBase::StartPresentation() { if( GetViewFrame() && GetViewFrame()->GetDispatcher() ) - GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } ::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer (void) diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 7fb2f2e05a05..d859637bb0a6 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -209,7 +209,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } mrViewShell.GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); bool bSetModified = true; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index d2508afe311b..59dd054fed19 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1168,7 +1168,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell) pView->UnmarkAll(); pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON); + SfxCallMode::ASYNCHRON); } } diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index e3a606bae0ea..fb0d194f9aad 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -282,7 +282,7 @@ void BezierObjectBar::Execute(SfxRequest& rReq) } if( (pIPPEC == mpView) && !mpView->AreObjectsMarked() ) - mpViewSh->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + mpViewSh->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); rReq.Ignore(); } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 7f435665ab42..1a01e03e4292 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -122,7 +122,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) else { if( mpViewShell && mpViewShell->GetViewFrame() ) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON ); + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON ); } rReq.Done(); @@ -572,11 +572,11 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // attributes for TextObjectBar case SID_ATTR_CHAR_FONT: mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON ); + Execute( SID_CHAR_DLG, SfxCallMode::ASYNCHRON ); break; case SID_ATTR_CHAR_FONTHEIGHT: mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON ); + Execute( SID_CHAR_DLG, SfxCallMode::ASYNCHRON ); break; case SID_ATTR_CHAR_COLOR: break; diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 93814cc08726..8dd8d031990a 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -154,7 +154,7 @@ void DrawViewShell::SelectionHasChanged (void) //Update3DWindow(); // 3D-Controller SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( - SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); SdrOle2Obj* pOleObj = NULL; @@ -685,7 +685,7 @@ void DrawViewShell::ResetActualPage() } GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } /** diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 4ac1be5ff2e7..f1a9454614ca 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -304,7 +304,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_FILL_BITMAP: case SID_ATTR_FILL_TRANSPARENCE: case SID_ATTR_FILL_FLOATTRANSPARENCE: - GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_AREA, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_AREA, SfxCallMode::ASYNCHRON ); break; case SID_ATTR_LINE_STYLE: case SID_ATTR_LINE_DASH: @@ -313,10 +313,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_LINE_TRANSPARENCE: case SID_ATTR_LINE_JOINT: case SID_ATTR_LINE_CAP: - GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_LINE, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_LINE, SfxCallMode::ASYNCHRON ); break; case SID_ATTR_TEXT_FITTOSIZE: - GetViewFrame()->GetDispatcher()->Execute( SID_TEXTATTR_DLG, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_TEXTATTR_DLG, SfxCallMode::ASYNCHRON ); break; } } @@ -357,7 +357,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdPage* pNewPage = CreateOrDuplicatePage (rReq, mePageKind, GetActualPage()); Cancel(); if(HasCurrentFunction(SID_BEZIER_EDIT) ) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); if (pNewPage != NULL) SwitchPage((pNewPage->GetPageNum()-1)/2); rReq.Done (); @@ -388,7 +388,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Cancel(); if(HasCurrentFunction(SID_BEZIER_EDIT)) GetViewFrame()->GetDispatcher()->Execute( - SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); rReq.Done (); } break; @@ -618,17 +618,17 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SVX_ZOOM_OPTIMAL: GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_ALL, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); break; case SVX_ZOOM_PAGEWIDTH: GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE_WIDTH, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); break; case SVX_ZOOM_WHOLEPAGE: GetViewFrame()->GetDispatcher()->Execute( SID_SIZE_PAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); break; case SVX_ZOOM_PAGEWIDTH_NOBORDER: OSL_FAIL("sd::DrawViewShell::FuTemporary(), SVX_ZOOM_PAGEWIDTH_NOBORDER not handled!" ); @@ -650,7 +650,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } if ( mpDrawView->IsPresObjSelected() ) @@ -686,7 +686,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( HasCurrentFunction(SID_BEZIER_EDIT) ) { // where applicable, activate right edit action GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } rReq.Ignore (); break; @@ -695,7 +695,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } if ( mpDrawView->IsPresObjSelected() ) @@ -723,7 +723,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if ( mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } if ( mpDrawView->IsPresObjSelected(true,true,true) ) @@ -1079,7 +1079,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { // The value (sal_uInt16)0xFFFF means set bullet on/off. SfxUInt16Item aItem(FN_SVX_SET_BULLET, (sal_uInt16)0xFFFF); - GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SFX_CALLMODE_RECORD, &aItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SfxCallMode::RECORD, &aItem, 0L ); } break; @@ -1087,7 +1087,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { // The value (sal_uInt16)0xFFFF means set bullet on/off. SfxUInt16Item aItem(FN_SVX_SET_NUMBER, (sal_uInt16)0xFFFF); - GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SFX_CALLMODE_RECORD, &aItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SfxCallMode::RECORD, &aItem, 0L ); } break; @@ -1539,7 +1539,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) GetDoc()->SetChanged(true); GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHLAYER, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); Cancel(); rReq.Done (); @@ -1763,7 +1763,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) pViewFrm->GetDispatcher()->Execute( SID_OPENDOC, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aUrl, &aTarget, &aFrm, &aReferer, &aNewView, &aBrowsing, @@ -2604,7 +2604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Cancel(); } else if( rReq.GetSlot() == SID_STYLE_APPLY ) - GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON ); rReq.Ignore (); } break; diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 414923858bab..7318d84bad9b 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -187,7 +187,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) SwitchPage(nSelectedPage); if(HasCurrentFunction(SID_BEZIER_EDIT)) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); Invalidate(); InvalidateWindows(); @@ -1016,13 +1016,13 @@ void DrawViewShell::ExecStatusBar(SfxRequest& rReq) { case SID_ATTR_SIZE: { - GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_TRANSFORM, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_TRANSFORM, SfxCallMode::ASYNCHRON ); } break; case SID_STATUS_LAYOUT: { - GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION_LAYOUT, SFX_CALLMODE_ASYNCHRON ); + GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION_LAYOUT, SfxCallMode::ASYNCHRON ); } break; } diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index e92efea8be57..8b7d1a06a59f 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -180,13 +180,13 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) GetView()->MarkObj(pCandidate, GetView()->GetSdrPageView()); GetViewFrame()->GetDispatcher()->Execute( - SID_ATTR_CHAR, SFX_CALLMODE_ASYNCHRON); + SID_ATTR_CHAR, SfxCallMode::ASYNCHRON); } else { // insert a new page with the same page layout GetViewFrame()->GetDispatcher()->Execute( - SID_INSERTPAGE_QUICK, SFX_CALLMODE_ASYNCHRON); + SID_INSERTPAGE_QUICK, SfxCallMode::ASYNCHRON); } } else @@ -922,7 +922,7 @@ void DrawViewShell::ShowSnapLineContextMenu ( const SfxPoolItem* aArguments[] = {&aHelpLineItem, NULL}; GetViewFrame()->GetDispatcher()->Execute( SID_SET_SNAPITEM, - SFX_CALLMODE_SLOT, + SfxCallMode::SLOT, aArguments); } break; diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index e76fae8a5676..9c9a151c08c1 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -74,7 +74,7 @@ void DrawViewShell::ModelHasChanged() SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( - SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); // now initialize the TextEditOutliner which was newly created by the draw engine ::Outliner* pOutliner = mpDrawView->GetTextEditOutliner(); @@ -128,7 +128,7 @@ void DrawViewShell::ArrangeGUIElements (void) { // with split, always resize first window //af pWindow = mpContentWindow.get(); - SfxRequest aReq(SID_SIZE_PAGE, 0, GetDoc()->GetItemPool()); + SfxRequest aReq(SID_SIZE_PAGE, SfxCallMode::SLOT, GetDoc()->GetItemPool()); ExecuteSlot( aReq ); } } @@ -300,7 +300,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) if ( mpDrawView->IsDesignMode() != pView->IsDesignMode() ) { SfxBoolItem aDesignModeItem( SID_FM_DESIGN_MODE, pView->IsDesignMode() ); - GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aDesignModeItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aDesignModeItem, 0L ); } // has to be called in the end, because it executes a WriteFrameViewData() diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index f41a51a5faa5..603814a2182a 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -174,7 +174,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) else if( nType == com::sun::star::gallery::GalleryItemType::MEDIA ) { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); - GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L ); } GetDocSh()->SetWaitCursor( false ); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 741bfe06a2a3..4f12613fdd7a 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -340,7 +340,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) } // start selection function - SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool()); + SfxRequest aReq(SID_OBJECT_SELECT, SfxCallMode::SLOT, GetDoc()->GetItemPool()); FuPermanent(aReq); mpDrawView->SetFrameDragSingles(true); @@ -566,7 +566,7 @@ void DrawViewShell::SetupPage (Size &rSize, // zoom onto (new) page size GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) @@ -776,7 +776,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) // Change to selection when turning on read-only mode. if(GetDocSh()->IsReadOnly() && dynamic_cast< FuSelection* >( GetCurrentFunction().get() ) ) { - SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool()); + SfxRequest aReq(SID_OBJECT_SELECT, SfxCallMode::SLOT, GetDoc()->GetItemPool()); FuPermanent(aReq); } @@ -787,7 +787,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) SfxBoolItem aItem( SID_FM_DESIGN_MODE, !mbReadOnly ); GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); } } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 58f8e602ddba..c3485e76ca9e 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -122,7 +122,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) // inform navigator about change SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); GetViewFrame()->GetDispatcher()->Execute( - SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); // Tell the slide sorter about the name change (necessary for // accessibility.) @@ -204,7 +204,7 @@ void DrawViewShell::ModifyLayer ( GetViewFrame()->GetDispatcher()->Execute( SID_SWITCHLAYER, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); // Call Invalidate at the form shell. FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell(); diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 31c500c72d4f..21357a1c96dd 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -142,7 +142,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); SfxBoolItem aBrowseItem(SID_BROWSE, true); pFrame->GetDispatcher()-> - Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + Execute(SID_OPENDOC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index f7999e8e0c92..99fd3547f5e0 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -466,7 +466,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } else { - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } rReq.Done(); @@ -612,8 +612,8 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) // Make FuText the current function. SfxUInt16Item aItem (SID_TEXTEDIT, 1); GetViewFrame()->GetDispatcher()-> - Execute(SID_TEXTEDIT, SFX_CALLMODE_SYNCHRON | - SFX_CALLMODE_RECORD, &aItem, 0L); + Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON | + SfxCallMode::RECORD, &aItem, 0L); // Put text object into edit mode. GetView()->SdrBeginTextEdit(static_cast<SdrTextObj*>(pObj), pPageView); break; @@ -671,7 +671,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) sal_uInt16 nMappedSlot = GetMappedSlot( nSId ); if( nMappedSlot > 0 ) { - SfxRequest aReq( nMappedSlot, 0, GetDoc()->GetItemPool() ); + SfxRequest aReq( nMappedSlot, SfxCallMode::SLOT, GetDoc()->GetItemPool() ); ExecuteSlot( aReq ); } } @@ -968,7 +968,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) ChangeEditMode(EM_MASTERPAGE, mbIsLayerModeActive); if(HasCurrentFunction(SID_BEZIER_EDIT)) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); } else { @@ -1028,7 +1028,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) { GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_SELECT, - SFX_CALLMODE_ASYNCHRON); + SfxCallMode::ASYNCHRON); } rReq.Done(); diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 73ce8d718f09..0394c23515d6 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -140,7 +140,7 @@ void DrawViewShell::AssignFrom3DWindow() sal_uInt16 nSId = SID_CONVERT_TO_3D; SfxBoolItem aItem( nSId, true ); GetViewFrame()->GetDispatcher()->Execute( - nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + nSId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); // Determine if a FILL attribute is set. // If not, hard set a fill attribute diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index c5d440cc9438..87bb4ad0f668 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -340,7 +340,7 @@ void OutlineViewShell::Activate( bool bIsMDIActivate ) if ( ! mbInitialized) { mbInitialized = true; - SfxRequest aRequest (SID_EDIT_OUTLINER, 0, GetDoc()->GetItemPool()); + SfxRequest aRequest (SID_EDIT_OUTLINER, SfxCallMode::SLOT, GetDoc()->GetItemPool()); FuPermanent (aRequest); } diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 7ac22abfa48c..2f6a68ccb5f5 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -126,7 +126,7 @@ void PresentationViewShell::Activate( bool bIsMDIActivate ) { SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); - GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if( xSlideShow.is() ) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 3a25f39be01d..fabc2aa506a8 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1054,8 +1054,8 @@ void View::onAccessibilityOptionsChanged() nPreviewSlot = SID_PREVIEW_QUALITY_COLOR; } - mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nOutputSlot, SFX_CALLMODE_ASYNCHRON ); - mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nPreviewSlot, SFX_CALLMODE_ASYNCHRON ); + mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nOutputSlot, SfxCallMode::ASYNCHRON ); + mpViewSh->GetViewFrame()->GetDispatcher()->Execute( nPreviewSlot, SfxCallMode::ASYNCHRON ); } mpViewSh->Invalidate(); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index a1cb0f2c6740..e0a48d4f1cc2 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -19,6 +19,7 @@ #include "View.hxx" #include <unotools/localfilehelper.hxx> +#include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> @@ -471,7 +472,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) aLowerAsciiFileName.indexOf(".sti") != -1 ) { ::sd::Window* pWin = mpViewSh->GetActiveWindow(); - SfxRequest aReq(SID_INSERTFILE, 0, mrDoc.GetItemPool()); + SfxRequest aReq(SID_INSERTFILE, ::SfxCallMode::SLOT, mrDoc.GetItemPool()); SfxStringItem aItem1( ID_VAL_DUMMY0, aCurrentDropFile ), aItem2( ID_VAL_DUMMY1, pFoundFilter->GetFilterName() ); aReq.AppendItem( aItem1 ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 6b83b61c829c..49149706a986 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -737,7 +737,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) if (pOldSettings->GetStyleSettings().GetScreenZoom() != rNewSettings.GetStyleSettings().GetScreenZoom()) mpViewShell->GetViewFrame()->GetDispatcher()-> - Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + Execute(SID_SIZE_PAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); /* Rearrange or initiate Resize for scroll bars since the size of the scroll bars my have changed. Within this, inside the resize- @@ -780,7 +780,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) SetBackground( Wallpaper( aDocColor ) ); } - SfxRequest aReq( nPreviewSlot, 0, mpViewShell->GetDocSh()->GetDoc()->GetItemPool() ); + SfxRequest aReq( nPreviewSlot, SfxCallMode::SLOT, mpViewShell->GetDocSh()->GetDoc()->GetItemPool() ); mpViewShell->ExecReq( aReq ); mpViewShell->Invalidate(); mpViewShell->ArrangeGUIElements(); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 45e395d76552..950cc7da480e 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -84,8 +84,8 @@ TabControl::~TabControl() void TabControl::Select() { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | - SFX_CALLMODE_RECORD); + pDispatcher->Execute(SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | + SfxCallMode::RECORD); } void TabControl::MouseButtonDown(const MouseEvent& rMEvt) @@ -107,7 +107,7 @@ void TabControl::MouseButtonDown(const MouseEvent& rMEvt) SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_INSERTPAGE_QUICK, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD); } } @@ -144,7 +144,7 @@ void TabControl::DoubleClick() { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute( SID_MODIFYPAGE, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD ); } } @@ -216,7 +216,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) if( pDrViewSh->IsSwitchPageAllowed() && pDoc->MovePages( nPageId ) ) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); - pDispatcher->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + pDispatcher->Execute(SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } break; @@ -250,7 +250,7 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt ) SetCurPageId (GetPageId(nPageNum)); SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_SWITCHPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } } @@ -342,7 +342,7 @@ void TabControl::ActivatePage() { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_SWITCHPAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } } diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index fcfadf25d940..4c112ed5d7bf 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -114,7 +114,7 @@ void ModifyPageUndoAction::Undo() // Redisplay SfxViewFrame::Current()->GetDispatcher()->Execute( - SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } void ModifyPageUndoAction::Redo() @@ -157,7 +157,7 @@ void ModifyPageUndoAction::Redo() // Redisplay SfxViewFrame::Current()->GetDispatcher()->Execute( - SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + SID_SWITCHPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } ModifyPageUndoAction::~ModifyPageUndoAction() diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 3cd27c9f5eab..7254f56709f4 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -302,7 +302,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd } } - mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SFX_CALLMODE_ASYNCHRON); + mrView.GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSID, SfxCallMode::ASYNCHRON); } return false; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index a7ba45ecbe6b..3724d462142a 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -643,7 +643,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, // zoom onto (new) page size pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); Broadcast (ViewShellHint(ViewShellHint::HINT_PAGE_RESIZE_END)); } @@ -785,7 +785,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) GetDocSh()->SetWaitCursor( false ); pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_OBJECT, - SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::SYNCHRON | SfxCallMode::RECORD); xObj = pObj->GetObjRef(); GetDocSh()->SetWaitCursor( true ); @@ -915,7 +915,7 @@ void ViewShell::ReadUserData(const OUString&) { // zoom onto VisArea from FrameView GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_VISAREA, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } void ViewShell::WriteUserData(OUString&) diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index c1886cd5bf74..ca6dbb148183 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -278,7 +278,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( Cancel(); if(HasCurrentFunction( SID_BEZIER_EDIT ) ) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); #ifndef DISABLE_SCRIPTING StarBASIC::FatalError (SbERR_BAD_PROP_VALUE); #endif @@ -291,7 +291,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( Cancel(); if(HasCurrentFunction(SID_BEZIER_EDIT) ) - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); #ifndef DISABLE_SCRIPTING StarBASIC::FatalError (SbERR_WRONG_ARGS); #endif diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 1dcf322653a4..343e4c4213dd 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -309,7 +309,7 @@ void ViewShell::Activate(bool bIsMDIActivate) if (GetDispatcher() != NULL) GetDispatcher()->Execute( SID_NAVIGATOR_INIT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L); |