diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-07 10:59:56 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-07 13:05:34 +0200 |
commit | 869aaf83bd6159dbfbc3e648b20537fd135dc6ca (patch) | |
tree | 0f2175b3ef1796323592299ee4b93a0f8f33fee2 /sfx2/source | |
parent | 4906c243877681b4559b495c1dfb4dbf8c51cfb8 (diff) |
convert SvtModuleOptions::EModule to scoped enum
Change-Id: I9665fc003cb3a44f4db857b24584fa3a70487259
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4c4db65e1c7c..e9b32c56697a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -702,7 +702,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) switch(nWhich) { case SID_TEMPLATE_ADDRESSBOKSOURCE: - if ( !SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE) ) + if ( !SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE) ) rSet.Put(SfxVisibilityItem(nWhich, false)); break; case SID_EXITANDRETURN: diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 4e0e195f2a32..247e80e140af 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -240,21 +240,21 @@ OUString getDefaultModule_Impl() { OUString sDefaultModule; SvtModuleOptions aModOpt; - if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) sDefaultModule = "swriter"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) sDefaultModule = "scalc"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) sDefaultModule = "simpress"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) sDefaultModule = "sdraw"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) sDefaultModule = "smath"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CHART ) ) sDefaultModule = "schart"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::BASIC ) ) sDefaultModule = "sbasic"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) sDefaultModule = "sdatabase"; else { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index a22285b0fbf7..ad9f98f769c2 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -238,22 +238,22 @@ void BackingWindow::initControls() aFileNewAppsAvailable.insert( sURL ); } - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SWRITER)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::WRITER)) mpAllRecentThumbnails->mnFileTypes |= TYPE_WRITER; - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SCALC)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::CALC)) mpAllRecentThumbnails->mnFileTypes |= TYPE_CALC; - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SIMPRESS)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::IMPRESS)) mpAllRecentThumbnails->mnFileTypes |= TYPE_IMPRESS; - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDRAW)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DRAW)) mpAllRecentThumbnails->mnFileTypes |= TYPE_DRAW; - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) mpAllRecentThumbnails->mnFileTypes |= TYPE_DATABASE; - if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SMATH)) + if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::MATH)) mpAllRecentThumbnails->mnFileTypes |= TYPE_MATH; mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fd6190da3448..fee3db0670df 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -863,10 +863,10 @@ void SfxTemplateManagerDlg::OnTemplateImport () // add filters of modules which are installed SvtModuleOptions aModuleOpt; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) sFilterExt += "*.ott;*.stw;*.oth"; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) { if ( !sFilterExt.isEmpty() ) sFilterExt += ";"; @@ -874,7 +874,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () sFilterExt += "*.ots;*.stc"; } - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) { if ( !sFilterExt.isEmpty() ) sFilterExt += ";"; @@ -882,7 +882,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () sFilterExt += "*.otp;*.sti"; } - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) { if ( !sFilterExt.isEmpty() ) sFilterExt += ";"; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 4f1a03a27d4b..c36076b522a1 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -3073,7 +3073,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, false); if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER ) { - if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) + if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) return; Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface(); Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) ); |