convert SvtModuleOptions::EModule to scoped enum

Change-Id: I9665fc003cb3a44f4db857b24584fa3a70487259

6 files changed, 24 insertions, 24 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();