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 /dbaccess | |
| parent | 4906c243877681b4559b495c1dfb4dbf8c51cfb8 (diff) | |
convert SvtModuleOptions::EModule to scoped enum
Change-Id: I9665fc003cb3a44f4db857b24584fa3a70487259
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 632da15e494e..84d51f92f08f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -628,11 +628,11 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const case SID_NEWDOC: case SID_APP_NEW_FORM: case ID_DOCUMENT_CREATE_REPWIZ: - aReturn.bEnabled = !isDataSourceReadOnly() && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SWRITER); + aReturn.bEnabled = !isDataSourceReadOnly() && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER); break; case SID_APP_NEW_REPORT: aReturn.bEnabled = !isDataSourceReadOnly() - && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SWRITER); + && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER); if ( aReturn.bEnabled ) { Reference< XContentEnumerationAccess > xEnumAccess(m_xContext->getServiceManager(), UNO_QUERY); @@ -713,7 +713,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const case SID_REPORT_CREATE_REPWIZ_PRE_SEL: case SID_APP_NEW_REPORT_PRE_SEL: aReturn.bEnabled = !isDataSourceReadOnly() - && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SWRITER) + && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::WRITER) && getContainer()->isALeafSelected(); if ( aReturn.bEnabled ) { diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 94db646b19c7..0613b7d54c50 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1180,21 +1180,21 @@ namespace // could not determine the document type we're living in // ->fallback SvtModuleOptions aModOpt; - if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) pReturn = "swriter"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) pReturn = "sdatabase"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) pReturn = "scalc"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) pReturn = "simpress"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) pReturn = "sdraw"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) pReturn = "smath"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::CHART ) ) pReturn = "schart"; - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) ) + else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::EModule::BASIC ) ) pReturn = "sbasic"; else { |