diff options
29 files changed, 141 insertions, 141 deletions
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 068d412ce069..5c114ff317f0 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -62,7 +62,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* m_pBtAdrBook->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) ); m_pCbbReceiver->SetModifyHdl ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) ); - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) m_pBtAdrBook->Hide(); } diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 0d9cdafb4df4..d7166442270b 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -786,15 +786,15 @@ bool ColorConfigWindow_Impl::IsGroupVisible (Group eGroup) const { case Group_Writer: case Group_Html: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SWRITER); + return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::WRITER); case Group_Calc: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SCALC); + return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::CALC); case Group_Draw: return - aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDRAW) || - aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SIMPRESS); + aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DRAW) || + aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::IMPRESS); case Group_Sql: - return aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDATABASE); + return aModuleOptions.IsModuleInstalled(SvtModuleOptions::EModule::DATABASE); default: return true; } diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 1f2fb44929db..51cfc2db2ca5 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -245,13 +245,13 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* ) SvtModuleOptions aModuleOpt; // int the same sequence as the enums of MSFltrPg2_CheckBoxEntries - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) InsertEntry( sChgToFromMath, static_cast< sal_IntPtr >( Math ) ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) InsertEntry( sChgToFromWriter, static_cast< sal_IntPtr >( Writer ) ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) InsertEntry( sChgToFromCalc, static_cast< sal_IntPtr >( Calc ) ); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) InsertEntry( sChgToFromImpress, static_cast< sal_IntPtr >( Impress ) ); InsertEntry( sChgToFromSmartArt, static_cast< sal_IntPtr >( SmartArt ), true, false ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f7798adee1ea..1106933ef54f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -289,7 +289,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) { // only writer uses autotext if ( i == SvtPathOptions::PATH_AUTOTEXT - && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) continue; switch (i) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index da95054e252a..1bc7861c0905 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -123,7 +123,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet aAutoSaveEdit->SetMaxTextLen( 2 ); SvtModuleOptions aModuleOpt; - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) { aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_MATH) )); aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_MATH) )); @@ -134,7 +134,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pImpl->aDefaultReadonlyArr[APP_MATH] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::MATH); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) { aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_DRAW) )); aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_DRAW) )); @@ -145,7 +145,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pImpl->aDefaultReadonlyArr[APP_DRAW] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::DRAW); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) { aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_IMPRESS) )); aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_IMPRESS) )); @@ -156,7 +156,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pImpl->aDefaultReadonlyArr[APP_IMPRESS] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::IMPRESS); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) { aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_CALC) )); aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( reinterpret_cast<void*>(APP_CALC) )); @@ -167,7 +167,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pImpl->aDefaultReadonlyArr[APP_CALC] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::CALC); } - if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) { aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER) )); aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( reinterpret_cast<void*>(APP_WRITER_WEB) )); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b1a274e88e05..42154b213a2f 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1564,7 +1564,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Writer and Writer/Web options SvtModuleOptions aModuleOpt; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) { // text document ResStringArray& rTextArray = aDlgResource.GetTextArray(); @@ -1614,7 +1614,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } // Calc options - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) { if ( aFactory == "com.sun.star.sheet.SpreadsheetDocument" ) { @@ -1639,7 +1639,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Impress options SfxModule* pSdMod = *reinterpret_cast<SfxModule**>(GetAppData( SHL_DRAW )); - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) { if ( aFactory == "com.sun.star.presentation.PresentationDocument" ) { @@ -1662,7 +1662,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } // Draw options - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) { if ( aFactory == "com.sun.star.drawing.DrawingDocument" ) { @@ -1685,7 +1685,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } // Math options - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) { if ( aFactory == "com.sun.star.formula.FormulaProperties" ) { @@ -1707,9 +1707,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Database - needed only if there is an application which integrates with databases if ( !lcl_isOptionHidden( SID_SB_STARBASEOPTIONS, aOptionsDlgOpt ) && - ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) - || aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) - || aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) + ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) + || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) + || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) ) { ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray(); 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 { diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index f85026e9c35b..9756394a92a8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1502,7 +1502,7 @@ int Desktop::Main() if ( !pExecGlobals->bRestartRequested ) { if ((!rCmdLineArgs.WantsToLoadDocument() && !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsQuickstart()) && - (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) && + (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE)) && (!bExistsRecoveryData ) && (!bExistsSessionData ) && (!Application::AnyInput( VclInputFlags::APPEVENT ) )) @@ -2335,13 +2335,13 @@ void Desktop::OpenClients() SvtModuleOptions aOpt; // Support command line parameters to start a module (as preselection) - if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER ); - else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC ); - else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS ); - else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW ); } @@ -2397,36 +2397,36 @@ void Desktop::OpenDefault() if ( rArgs.HasModuleParam() ) { // Support new command line parameters to start a module - if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER ); - else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC ); - else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS ); - else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE ); - else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW ); - else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) + else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::MATH ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::MATH ); - else if ( rArgs.IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + else if ( rArgs.IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERGLOBAL ); - else if ( rArgs.IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + else if ( rArgs.IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERWEB ); } if ( aName.isEmpty() ) { // Old way to create a default document - if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE ); - else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW ); else return; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 083172cab2fc..1a3cc9f77220 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -927,13 +927,13 @@ void OfficeIPCThread::execute() SvtModuleOptions aOpt; // Support command line parameters to start a module (as preselection) - if ( aCmdLineArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) + if ( aCmdLineArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER ); - else if ( aCmdLineArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) + else if ( aCmdLineArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC ); - else if ( aCmdLineArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) + else if ( aCmdLineArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) ) pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS ); - else if ( aCmdLineArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) + else if ( aCmdLineArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::EModule::DRAW ) ) pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW ); } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 9cb3ce6c79ac..105941592695 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -904,7 +904,7 @@ namespace pcr // no cursor source if no Base is installed. #124939# // This fix is not intendend to appear on the main trunk. If you find it there, // please tell me! frank.schoenheit@sun.com - if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) const_cast< FormComponentPropertyHandler* >( this )->m_bHaveListSource = true; break; @@ -912,7 +912,7 @@ namespace pcr // no cursor source if no Base is installed. #124939# // This fix is not intendend to appear on the main trunk. If you find it there, // please tell me! frank.schoenheit@sun.com - if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) const_cast< FormComponentPropertyHandler* >( this )->m_bHaveCommand = true; break; } // switch ( nPropId ) @@ -2286,7 +2286,7 @@ namespace pcr // This fix is not intendend to appear on the main trunk. If you find it there, // please tell me! frank.schoenheit@sun.com if ( ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0 ) - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) return true; return false; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 5eb206b0cab7..9548861a41ee 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -345,7 +345,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) { if (eOperation == E_CLOSE_FRAME) bTerminateApp = true; - else if( SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE) ) + else if( SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE) ) bEstablishBackingMode = true; else bTerminateApp = true; diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index e0e17189409a..726802cbb050 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -112,7 +112,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere bool StartModuleDispatcher::implts_isBackingModePossible() { - if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) + if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE)) return false; css::uno::Reference< css::frame::XFramesSupplier > xDesktop( diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index de6fd0baddf5..dc6eba74b022 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -3120,7 +3120,7 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame /*IN*/ bool bState ) { // Note: If start module is not installed - no closer has to be shown! - if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) + if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE)) return; try diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 9bc5e09e3266..23e975cec01d 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -49,19 +49,19 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: { public: - enum EModule + enum class EModule { - E_SWRITER = 0, - E_SCALC = 1, - E_SDRAW = 2, - E_SIMPRESS = 3, - E_SMATH = 4, - E_SCHART = 5, - E_SSTARTMODULE = 6, - E_SBASIC = 7, - E_SDATABASE = 8, - E_SWEB = 9, - E_SGLOBAL = 10 + WRITER = 0, + CALC = 1, + DRAW = 2, + IMPRESS = 3, + MATH = 4, + CHART = 5, + STARTMODULE = 6, + BASIC = 7, + DATABASE = 8, + WEB = 9, + GLOBAL = 10 }; /*ATTENTION: diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 07a79c625398..e3ead3d7d19b 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -248,7 +248,7 @@ ScPrintUIOptions::ScPrintUIOptions() // create Section for spreadsheet (results in an extra tab page in dialog) SvtModuleOptions aOpt; OUString aAppGroupname( aStrings.GetString( 9 ) ); - aAppGroupname = aAppGroupname.replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); + aAppGroupname = aAppGroupname.replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::EModule::CALC ) ); m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, OUString()); // show subgroup for pages diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 24acddde3942..6e5bf8889827 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1074,7 +1074,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) case SID_VIEW_DATA_SOURCE_BROWSER: { - if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) + if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) rSet.Put(SfxVisibilityItem(nWhich, false)); else // get state (BoolItem) from SfxViewFrame diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 8802c7f2701c..b49fffc24a82 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -378,7 +378,7 @@ namespace { SvtModuleOptions aOpt; OUString aAppGroupname(SD_RESSTR(_STR_IMPRESS_PRINT_UI_GROUP_NAME)); aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName( - mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW)); + mbImpress ? SvtModuleOptions::EModule::IMPRESS : SvtModuleOptions::EModule::DRAW)); AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage")); uno::Sequence< OUString > aHelpIds, aWidgetIds; 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 ) ); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index b8c4ad0f204e..4ade3f82cef9 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -85,7 +85,7 @@ SmPrintUIOptions::SmPrintUIOptions() SvtModuleOptions aOpt; OUString aAppGroupname( aLocalizedStrings.GetString( 0 ). - replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ) ); + replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::EModule::MATH ) ) ); m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create subgroup for print options diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index bdec9ce5af2b..fa95fc6e0061 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -847,7 +847,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) break; case SID_FM_USE_WIZARDS: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) rSet.Put( SfxVisibilityItem( nWhich, false ) ); else if (!GetFormModel()) rSet.DisableItem( nWhich ); @@ -869,7 +869,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) case SID_FM_NAVIGATIONBAR: case SID_FM_DBGRID: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) { rSet.Put( SfxVisibilityItem( nWhich, false ) ); break; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index e6f7557acd89..c90075277c2f 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -997,7 +997,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) // #i46898# no wizards if there is no Base installed - currently, all wizards are // database related - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) return; if ( m_nControlWizardEvent ) diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 2e50e90e07c0..f0c11fe2611c 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -193,7 +193,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create "writer" section (new tab page in dialog) SvtModuleOptions aModOpt; OUString aAppGroupname( aLocalizedStrings.GetString( 0 ) ); - aAppGroupname = aAppGroupname.replaceFirst( "%s", aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) ); + aAppGroupname = aAppGroupname.replaceFirst( "%s", aModOpt.GetModuleName( SvtModuleOptions::EModule::WRITER ) ); m_aUIProperties[ nIdx++ ].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create sub section for Contents diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index d55975b86d9c..b2aafe025565 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -395,7 +395,7 @@ void SwView::GetState(SfxItemSet &rSet) rSet.DisableItem(nWhich); break; case SID_VIEW_DATA_SOURCE_BROWSER: - if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) ) + if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) ) rSet.Put( SfxVisibilityItem( nWhich, false ) ); else rSet.Put( SfxBoolItem( nWhich, GetViewFrame()->HasChildWindow( SID_BROWSER ) ) ); diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 110231090018..b646e3ea1915 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -447,27 +447,27 @@ bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule bool bInstalled = false; switch( eModule ) { - case SvtModuleOptions::E_SWRITER : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITER].getInstalled(); + case SvtModuleOptions::EModule::WRITER : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITER].getInstalled(); break; - case SvtModuleOptions::E_SWEB : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITERWEB].getInstalled(); + case SvtModuleOptions::EModule::WEB : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITERWEB].getInstalled(); break; - case SvtModuleOptions::E_SGLOBAL : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITERGLOBAL].getInstalled(); + case SvtModuleOptions::EModule::GLOBAL : bInstalled = m_lFactories[SvtModuleOptions::EFactory::WRITERGLOBAL].getInstalled(); break; - case SvtModuleOptions::E_SCALC : bInstalled = m_lFactories[SvtModuleOptions::EFactory::CALC].getInstalled(); + case SvtModuleOptions::EModule::CALC : bInstalled = m_lFactories[SvtModuleOptions::EFactory::CALC].getInstalled(); break; - case SvtModuleOptions::E_SDRAW : bInstalled = m_lFactories[SvtModuleOptions::EFactory::DRAW].getInstalled(); + case SvtModuleOptions::EModule::DRAW : bInstalled = m_lFactories[SvtModuleOptions::EFactory::DRAW].getInstalled(); break; - case SvtModuleOptions::E_SIMPRESS : bInstalled = m_lFactories[SvtModuleOptions::EFactory::IMPRESS].getInstalled(); + case SvtModuleOptions::EModule::IMPRESS : bInstalled = m_lFactories[SvtModuleOptions::EFactory::IMPRESS].getInstalled(); break; - case SvtModuleOptions::E_SMATH : bInstalled = m_lFactories[SvtModuleOptions::EFactory::MATH].getInstalled(); + case SvtModuleOptions::EModule::MATH : bInstalled = m_lFactories[SvtModuleOptions::EFactory::MATH].getInstalled(); break; - case SvtModuleOptions::E_SCHART : bInstalled = m_lFactories[SvtModuleOptions::EFactory::CHART].getInstalled(); + case SvtModuleOptions::EModule::CHART : bInstalled = m_lFactories[SvtModuleOptions::EFactory::CHART].getInstalled(); break; - case SvtModuleOptions::E_SSTARTMODULE : bInstalled = m_lFactories[SvtModuleOptions::EFactory::STARTMODULE].getInstalled(); + case SvtModuleOptions::EModule::STARTMODULE : bInstalled = m_lFactories[SvtModuleOptions::EFactory::STARTMODULE].getInstalled(); break; - case SvtModuleOptions::E_SBASIC : bInstalled = true; // Couldn't be deselected by setup yet! + case SvtModuleOptions::EModule::BASIC : bInstalled = true; // Couldn't be deselected by setup yet! break; - case SvtModuleOptions::E_SDATABASE : bInstalled = m_lFactories[SvtModuleOptions::EFactory::DATABASE].getInstalled(); + case SvtModuleOptions::EModule::DATABASE : bInstalled = m_lFactories[SvtModuleOptions::EFactory::DATABASE].getInstalled(); break; } @@ -711,7 +711,7 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtMod // no else! if( !bState ) { - eFactory = SvtModuleOptions::E_BASIC; + eFactory = SvtModuleOptions::EFactory::BASIC; bState = ( sName == FACTORYNAME_BASIC); } @@ -937,43 +937,43 @@ void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, bool SvtModuleOptions::IsMath() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SMATH ); + return m_pDataContainer->IsModuleInstalled( EModule::MATH ); } bool SvtModuleOptions::IsChart() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SCHART ); + return m_pDataContainer->IsModuleInstalled( EModule::CHART ); } bool SvtModuleOptions::IsCalc() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SCALC ); + return m_pDataContainer->IsModuleInstalled( EModule::CALC ); } bool SvtModuleOptions::IsDraw() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SDRAW ); + return m_pDataContainer->IsModuleInstalled( EModule::DRAW ); } bool SvtModuleOptions::IsWriter() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SWRITER ); + return m_pDataContainer->IsModuleInstalled( EModule::WRITER ); } bool SvtModuleOptions::IsImpress() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SIMPRESS ); + return m_pDataContainer->IsModuleInstalled( EModule::IMPRESS ); } bool SvtModuleOptions::IsDataBase() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); - return m_pDataContainer->IsModuleInstalled( E_SDATABASE ); + return m_pDataContainer->IsModuleInstalled( EModule::DATABASE ); } namespace @@ -997,16 +997,16 @@ OUString SvtModuleOptions::GetModuleName( EModule eModule ) const { switch( eModule ) { - case SvtModuleOptions::E_SWRITER : { return OUString("Writer"); } - case SvtModuleOptions::E_SWEB : { return OUString("Web"); } - case SvtModuleOptions::E_SGLOBAL : { return OUString("Global"); } - case SvtModuleOptions::E_SCALC : { return OUString("Calc"); } - case SvtModuleOptions::E_SDRAW : { return OUString("Draw"); } - case SvtModuleOptions::E_SIMPRESS : { return OUString("Impress"); } - case SvtModuleOptions::E_SMATH : { return OUString("Math"); } - case SvtModuleOptions::E_SCHART : { return OUString("Chart"); } - case SvtModuleOptions::E_SBASIC : { return OUString("Basic"); } - case SvtModuleOptions::E_SDATABASE : { return OUString("Database"); } + case SvtModuleOptions::EModule::WRITER : { return OUString("Writer"); } + case SvtModuleOptions::EModule::WEB : { return OUString("Web"); } + case SvtModuleOptions::EModule::GLOBAL : { return OUString("Global"); } + case SvtModuleOptions::EModule::CALC : { return OUString("Calc"); } + case SvtModuleOptions::EModule::DRAW : { return OUString("Draw"); } + case SvtModuleOptions::EModule::IMPRESS : { return OUString("Impress"); } + case SvtModuleOptions::EModule::MATH : { return OUString("Math"); } + case SvtModuleOptions::EModule::CHART : { return OUString("Chart"); } + case SvtModuleOptions::EModule::BASIC : { return OUString("Basic"); } + case SvtModuleOptions::EModule::DATABASE : { return OUString("Database"); } default: OSL_FAIL( "unknown module" ); break; @@ -1172,21 +1172,21 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u OUString SvtModuleOptions::GetDefaultModuleName() { OUString aModule; - if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWRITER)) + if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::WRITER)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::WRITER); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SCALC)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::CALC)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::CALC); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SIMPRESS)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::IMPRESS)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::IMPRESS); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::DATABASE); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDRAW)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::DRAW)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::DRAW); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWEB)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::WEB)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::WRITERWEB); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SGLOBAL)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::GLOBAL)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::WRITERGLOBAL); - else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SMATH)) + else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::EModule::MATH)) aModule = GetFactoryShortName(SvtModuleOptions::EFactory::MATH); return aModule; } |