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/app | |
| 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/app')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/app/tmplctrl.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
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); } |