convert SvtModuleOptions::EFactory to enum class

and fix issues in iterating through o3tl::enumarray

Change-Id: Ia59ef9be44d8c92c2e406fa71aa92269578e26e3

2 files changed, 30 insertions, 30 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bb352e2ed204..f85026e9c35b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2336,13 +2336,13 @@ void Desktop::OpenClients()
 
             // Support command line parameters to start a module (as preselection)
             if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-                aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::E_WRITER );
+                aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER );
             else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-                aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::E_CALC );
+                aRequest.aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC );
             else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-                aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::E_IMPRESS );
+                aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS );
             else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-                aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::E_DRAW );
+                aRequest.aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW );
         }
 
         // check for printing disabled
@@ -2398,36 +2398,36 @@ void Desktop::OpenDefault()
     {
         // Support new command line parameters to start a module
         if ( rArgs.IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITER );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER );
         else if ( rArgs.IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_CALC );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC );
         else if ( rArgs.IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_IMPRESS );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS );
         else if ( rArgs.IsBase() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DATABASE );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE );
         else if ( rArgs.IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DRAW );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW );
         else if ( rArgs.IsMath() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_MATH );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::MATH );
         else if ( rArgs.IsGlobal() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITERGLOBAL );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERGLOBAL );
         else if ( rArgs.IsWeb() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITERWEB );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITERWEB );
     }
 
     if ( aName.isEmpty() )
     {
         // Old way to create a default document
         if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_WRITER );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::WRITER );
         else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_CALC );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::CALC );
         else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_IMPRESS );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::IMPRESS );
         else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DATABASE );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DATABASE );
         else if ( aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::E_DRAW );
+            aName = aOpt.GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory::DRAW );
         else
             return;
     }
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index d148b8ae60d8..083172cab2fc 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -852,23 +852,23 @@ void OfficeIPCThread::execute()
                     if ( aCmdLineArgs->HasModuleParam() && !bDocRequestSent )
                     {
                         SvtModuleOptions aOpt;
-                        SvtModuleOptions::EFactory eFactory = SvtModuleOptions::E_WRITER;
+                        SvtModuleOptions::EFactory eFactory = SvtModuleOptions::EFactory::WRITER;
                         if ( aCmdLineArgs->IsWriter() )
-                            eFactory = SvtModuleOptions::E_WRITER;
+                            eFactory = SvtModuleOptions::EFactory::WRITER;
                         else if ( aCmdLineArgs->IsCalc() )
-                            eFactory = SvtModuleOptions::E_CALC;
+                            eFactory = SvtModuleOptions::EFactory::CALC;
                         else if ( aCmdLineArgs->IsDraw() )
-                            eFactory = SvtModuleOptions::E_DRAW;
+                            eFactory = SvtModuleOptions::EFactory::DRAW;
                         else if ( aCmdLineArgs->IsImpress() )
-                            eFactory = SvtModuleOptions::E_IMPRESS;
+                            eFactory = SvtModuleOptions::EFactory::IMPRESS;
                         else if ( aCmdLineArgs->IsBase() )
-                            eFactory = SvtModuleOptions::E_DATABASE;
+                            eFactory = SvtModuleOptions::EFactory::DATABASE;
                         else if ( aCmdLineArgs->IsMath() )
-                            eFactory = SvtModuleOptions::E_MATH;
+                            eFactory = SvtModuleOptions::EFactory::MATH;
                         else if ( aCmdLineArgs->IsGlobal() )
-                            eFactory = SvtModuleOptions::E_WRITERGLOBAL;
+                            eFactory = SvtModuleOptions::EFactory::WRITERGLOBAL;
                         else if ( aCmdLineArgs->IsWeb() )
-                            eFactory = SvtModuleOptions::E_WRITERWEB;
+                            eFactory = SvtModuleOptions::EFactory::WRITERWEB;
 
                         if ( !pRequest->aOpenList.empty() )
                             pRequest->aModule = aOpt.GetFactoryName( eFactory );
@@ -928,13 +928,13 @@ void OfficeIPCThread::execute()
 
                         // Support command line parameters to start a module (as preselection)
                         if ( aCmdLineArgs->IsWriter() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-                            pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::E_WRITER );
+                            pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::WRITER );
                         else if ( aCmdLineArgs->IsCalc() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-                            pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::E_CALC );
+                            pRequest->aModule = aOpt.GetFactoryName( SvtModuleOptions::EFactory::CALC );
                         else if ( aCmdLineArgs->IsImpress() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-                            pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::E_IMPRESS );
+                            pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::IMPRESS );
                         else if ( aCmdLineArgs->IsDraw() && aOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-                            pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::E_DRAW );
+                            pRequest->aModule= aOpt.GetFactoryName( SvtModuleOptions::EFactory::DRAW );
                     }
 
                     ImplPostProcessDocumentsEvent( pRequest );