convert EConfigurationModes to scoped enum

Change-Id: I1e81c8d637e738f536f7efad8b67d0c9183e6483

18 files changed, 70 insertions, 65 deletions

diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index d802ea137f3a..f5eb95ec4dfe 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -31,8 +31,8 @@ namespace comphelper{
 
 
 css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                                                                            const OUString&                                    sPackage,
-                                                                                  sal_Int32                                           eMode   )
+                                                                            const OUString&                                           sPackage,
+                                                                                  EConfigurationModes                                 eMode   )
 {
     css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
         css::configuration::theDefaultProvider::get( rxContext ) );
@@ -46,7 +46,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     lParams.push_back(css::uno::makeAny(aParam));
 
     // enable all locales mode
-    if ((eMode & ConfigurationHelper::E_ALL_LOCALES)==ConfigurationHelper::E_ALL_LOCALES)
+    if (eMode & EConfigurationModes::AllLocales)
     {
         aParam.Name    = "locale";
         aParam.Value <<= OUString("*");
@@ -54,7 +54,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     }
 
     // enable lazy writing
-    bool bLazy = ((eMode & ConfigurationHelper::E_LAZY_WRITE)==ConfigurationHelper::E_LAZY_WRITE);
+    bool bLazy(eMode & EConfigurationModes::LazyWrite);
     aParam.Name    = "lazywrite";
     aParam.Value   = css::uno::makeAny(bLazy);
     lParams.push_back(css::uno::makeAny(aParam));
@@ -62,7 +62,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
     // open it
     css::uno::Reference< css::uno::XInterface > xCFG;
 
-    bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY);
+    bool bReadOnly(eMode & EConfigurationModes::ReadOnly);
     if (bReadOnly)
         xCFG = xConfigProvider->createInstanceWithArguments(
                 "com.sun.star.configuration.ConfigurationAccess",
@@ -158,7 +158,7 @@ css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css:
                                                  const OUString&                                       sPackage,
                                                  const OUString&                                       sRelPath,
                                                  const OUString&                                       sKey    ,
-                                                       sal_Int32                                              eMode   )
+                                                       EConfigurationModes                             eMode   )
 {
     css::uno::Reference< css::uno::XInterface > xCFG = ConfigurationHelper::openConfig(rxContext, sPackage, eMode);
     return ConfigurationHelper::readRelativeKey(xCFG, sRelPath, sKey);
@@ -169,8 +169,8 @@ void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XC
                                          const OUString&                                       sPackage,
                                          const OUString&                                       sRelPath,
                                          const OUString&                                       sKey    ,
-                                         const css::uno::Any&                                         aValue  ,
-                                               sal_Int32                                              eMode   )
+                                         const css::uno::Any&                                  aValue  ,
+                                               EConfigurationModes                             eMode   )
 {
     css::uno::Reference< css::uno::XInterface > xCFG = ConfigurationHelper::openConfig(rxContext, sPackage, eMode);
     ConfigurationHelper::writeRelativeKey(xCFG, sRelPath, sKey, aValue);
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 586011adc04b..b575fbe5b2af 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -522,7 +522,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
 {
     const OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
     m_xCfg.set(
-             ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
+             ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_ACCELERATORS, ::comphelper::EConfigurationModes::AllLocales ),
              css::uno::UNO_QUERY );
 }
 
@@ -972,14 +972,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
     if ( sConfig == "Global" )
     {
         m_xCfg.set(
-            ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
+            ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_GLOBAL, ::comphelper::EConfigurationModes::AllLocales ),
             css::uno::UNO_QUERY );
         XCUBasedAcceleratorConfiguration::reload();
     }
     else if ( sConfig == "Modules" )
     {
         m_xCfg.set(
-            ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
+            ::comphelper::ConfigurationHelper::openConfig( m_xContext, CFG_ENTRY_MODULES, ::comphelper::EConfigurationModes::AllLocales ),
             css::uno::UNO_QUERY );
         XCUBasedAcceleratorConfiguration::reload();
     }
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 3cdf50064760..c4fbaf055b60 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -175,7 +175,7 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(
             "org.openoffice.Setup/",
             "Office/Factories/*[\"" + sModuleName + "\"]",
             "ooSetupFactoryWindowAttributes",
-            ::comphelper::ConfigurationHelper::E_READONLY) >>= sWindowState;
+            ::comphelper::EConfigurationModes::ReadOnly) >>= sWindowState;
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
@@ -196,7 +196,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(
             "Office/Factories/*[\"" + sModuleName + "\"]",
             "ooSetupFactoryWindowAttributes",
             css::uno::makeAny(sWindowState),
-            ::comphelper::ConfigurationHelper::E_STANDARD);
+            ::comphelper::EConfigurationModes::Standard);
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index d1e75f1b159b..2b8d2e1761e0 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -59,7 +59,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup,
                             ::comphelper::ConfigurationHelper::openConfig(
                                 m_xContext,
                                 "/org.openoffice.Setup/Office/Factories",
-                                ::comphelper::ConfigurationHelper::E_READONLY),
+                                ::comphelper::EConfigurationModes::ReadOnly),
                             css::uno::UNO_QUERY_THROW);
 
                         // ask for office locale
@@ -68,7 +68,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup,
                             "/org.openoffice.Setup",
                             "L10N",
                             "ooLocale",
-                            ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sLocale;
+                            ::comphelper::EConfigurationModes::ReadOnly) >>= m_sLocale;
 
                         // detect system
                         ::comphelper::ConfigurationHelper::readDirectKey(
@@ -76,7 +76,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup,
                             "/org.openoffice.Office.Common",
                             "Help",
                             "System",
-                            ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sSystem;
+                            ::comphelper::EConfigurationModes::ReadOnly) >>= m_sSystem;
 
                         // Start listening for disposing events of these services,
                         // so we can react e.g. for an office shutdown
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 0ebf0006c556..1a29255b064f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -923,7 +923,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
                                 "org.openoffice.Office.Common/",
                                 "Misc",
                                 "MaxOpenDocuments",
-                                ::comphelper::ConfigurationHelper::E_READONLY);
+                                ::comphelper::EConfigurationModes::ReadOnly);
 
         // NIL means: count of allowed documents = infinite !
         //     => return sal_True
@@ -1641,7 +1641,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
                   "org.openoffice.Office.Common/View",
                   "NewDocumentHandling",
                   "ForceFocusAndToFront",
-                  ::comphelper::ConfigurationHelper::E_READONLY);
+                  ::comphelper::EConfigurationModes::ReadOnly);
             a >>= bForceFrontAndFocus;
         }
 
@@ -1718,7 +1718,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
         css::uno::Reference< css::container::XNameAccess > xModuleCfg(::comphelper::ConfigurationHelper::openConfig(
                                                                         xContext,
                                                                         PACKAGE_SETUP_MODULES,
-                                                                        ::comphelper::ConfigurationHelper::E_READONLY),
+                                                                        ::comphelper::EConfigurationModes::ReadOnly),
                                                                       css::uno::UNO_QUERY_THROW);
 
         // read window state from the configuration
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 240493a1563c..82ef3646c452 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1761,7 +1761,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
     OUString sCFG_PACKAGE_RECOVERY(CFG_PACKAGE_RECOVERY);
     // throws a RuntimeException if an error occurs!
     css::uno::Reference< css::container::XNameAccess > xCFG(
-        ::comphelper::ConfigurationHelper::openConfig(m_xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD),
+        ::comphelper::ConfigurationHelper::openConfig(m_xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::EConfigurationModes::Standard),
         css::uno::UNO_QUERY);
 
     sal_Int32 nMinSpaceDocSave    = MIN_DISCSPACE_DOCSAVE;
@@ -1774,13 +1774,13 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
                                                          sCFG_PACKAGE_RECOVERY,
                                                          sCFG_PATH_AUTOSAVE,
                                                          CFG_ENTRY_MINSPACE_DOCSAVE,
-                                                         ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceDocSave;
+                                                         ::comphelper::EConfigurationModes::Standard) >>= nMinSpaceDocSave;
 
         ::comphelper::ConfigurationHelper::readDirectKey(m_xContext,
                                                          sCFG_PACKAGE_RECOVERY,
                                                          sCFG_PATH_AUTOSAVE,
                                                          CFG_ENTRY_MINSPACE_CONFIGSAVE,
-                                                         ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceConfigSave;
+                                                         ::comphelper::EConfigurationModes::Standard) >>= nMinSpaceConfigSave;
     }
     catch(const css::uno::Exception&)
     {
@@ -1952,7 +1952,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
         {
             // open module config on demand and cache the update access
             xCFG.set( ::comphelper::ConfigurationHelper::openConfig(m_xContext, CFG_PACKAGE_MODULES,
-                           ::comphelper::ConfigurationHelper::E_STANDARD),
+                           ::comphelper::EConfigurationModes::Standard),
                       css::uno::UNO_QUERY_THROW);
 
             /* SAFE */ {
@@ -3717,7 +3717,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
         CFG_PATH_RECOVERYINFO,
         CFG_ENTRY_CRASHED,
         css::uno::makeAny(sal_True),
-        ::comphelper::ConfigurationHelper::E_STANDARD);
+        ::comphelper::EConfigurationModes::Standard);
 
     // for all docs, store their current view/names in the configurtion
     implts_persistAllActiveViewNames();
@@ -3777,7 +3777,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams)
         CFG_PATH_RECOVERYINFO,
         CFG_ENTRY_CRASHED,
         css::uno::makeAny(sal_False),
-        ::comphelper::ConfigurationHelper::E_STANDARD);
+        ::comphelper::EConfigurationModes::Standard);
 }
 
 void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
@@ -3842,7 +3842,7 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
         CFG_PATH_RECOVERYINFO,
         CFG_ENTRY_SESSIONDATA,
         css::uno::makeAny(sal_True),
-        ::comphelper::ConfigurationHelper::E_STANDARD);
+        ::comphelper::EConfigurationModes::Standard);
 
     // flush config cached back to disc.
     impl_flushALLConfigChanges();
@@ -3877,7 +3877,7 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
         CFG_PATH_RECOVERYINFO,
         CFG_ENTRY_SESSIONDATA,
         css::uno::makeAny(sal_False),
-        ::comphelper::ConfigurationHelper::E_STANDARD);
+        ::comphelper::EConfigurationModes::Standard);
 
     SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()");
 }
@@ -4009,7 +4009,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                                                     CFG_PACKAGE_RECOVERY,
                                                     CFG_PATH_RECOVERYINFO,
                                                     CFG_ENTRY_SESSIONDATA,
-                                                    ::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData;
+                                                    ::comphelper::EConfigurationModes::ReadOnly) >>= bSessionData;
 
                     bool bRecoveryData = m_lDocCache.size() > 0;
 
@@ -4028,7 +4028,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                             CFG_PACKAGE_RECOVERY,
                             CFG_PATH_RECOVERYINFO,
                             CFG_ENTRY_CRASHED,
-                            ::comphelper::ConfigurationHelper::E_READONLY);
+                            ::comphelper::EConfigurationModes::ReadOnly);
                 break;
 
         case AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA :
@@ -4037,7 +4037,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                             CFG_PACKAGE_RECOVERY,
                             CFG_PATH_RECOVERYINFO,
                             CFG_ENTRY_SESSIONDATA,
-                            ::comphelper::ConfigurationHelper::E_READONLY);
+                            ::comphelper::EConfigurationModes::ReadOnly);
                 break;
     }
 }
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index a9ffb24cba90..e697295964c3 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -147,7 +147,7 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont
 {
     m_xCFG.set( comphelper::ConfigurationHelper::openConfig(
                 m_xContext, "/org.openoffice.Setup/Office/Factories",
-                comphelper::ConfigurationHelper::E_READONLY),
+                comphelper::EConfigurationModes::ReadOnly ),
             css::uno::UNO_QUERY_THROW );
 }
 
@@ -250,7 +250,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
     css::uno::Reference< css::uno::XInterface >         xCfg      = ::comphelper::ConfigurationHelper::openConfig(
                                                                         m_xContext,
                                                                         "/org.openoffice.Setup/Office/Factories",
-                                                                        ::comphelper::ConfigurationHelper::E_STANDARD);
+                                                                        ::comphelper::EConfigurationModes::Standard);
     css::uno::Reference< css::container::XNameAccess >  xModules (xCfg, css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNameReplace > xModule  ;
 
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 063966f5b3f0..552b2e8cc650 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1464,7 +1464,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
         xCfg.set(  ::comphelper::ConfigurationHelper::openConfig(
                         m_xContext,
                         CFG_NODE_OLD,
-                        ::comphelper::ConfigurationHelper::E_STANDARD), // not readonly! Sometimes we need write access there !!!
+                        ::comphelper::EConfigurationModes::Standard), // not readonly! Sometimes we need write access there !!!
                    css::uno::UNO_QUERY_THROW);
 
         { // SAFE ->
@@ -1491,7 +1491,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew()
         xCfg.set(  ::comphelper::ConfigurationHelper::openConfig(
                         m_xContext,
                         CFG_NODE_NEW,
-                        ::comphelper::ConfigurationHelper::E_STANDARD),
+                        ::comphelper::EConfigurationModes::Standard),
                    css::uno::UNO_QUERY_THROW);
 
         { // SAFE ->
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index 51ea3e64e26b..c5cf9d4ed28b 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -29,37 +29,43 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <o3tl/typed_flags_set.hxx>
 
 
-// namespaces
-
-namespace comphelper{
-
-
-class COMPHELPER_DLLPUBLIC ConfigurationHelper
+namespace comphelper
 {
-    public:
-
-
     /** specify all possible modes, which can be used to open a configuration access.
      *
      *  @see    openConfig()
      *  @see    readDirectKey()
      *  @see    writeDirectKey()
      */
-    enum EConfigurationModes
+    enum class EConfigurationModes
     {
         /// opens configuration in read/write mode (without LAZY writing!)
-        E_STANDARD = 0,
+        Standard = 0,
         /// configuration will be opened readonly
-        E_READONLY = 1,
+        ReadOnly = 1,
         /// all localized nodes will be interpreted as XInterface instead of interpreting it as atomic value nodes
-        E_ALL_LOCALES = 2,
+        AllLocales = 2,
         /// enable lazy writing
-        E_LAZY_WRITE = 4
+        LazyWrite = 4
     };
 
 
+}
+
+namespace o3tl
+{
+    template<> struct typed_flags<comphelper::EConfigurationModes> : is_typed_flags<comphelper::EConfigurationModes, 0x7> {};
+}
+
+namespace comphelper
+{
+
+class COMPHELPER_DLLPUBLIC ConfigurationHelper
+{
+public:
     /** returns access to the specified configuration package.
      *
      *  This method should be used, if e.g. more than one request to the same
@@ -86,8 +92,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      *          E.g. css::uno::Exception if the configuration could not be opened.
      */
     static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                                                                  const OUString&                                    sPackage,
-                                                                        sal_Int32                                           eMode   );
+                                                                  const OUString&                                           sPackage,
+                                                                        EConfigurationModes                                 eMode   );
 
 
     /** reads the value of an existing(!) configuration key,
@@ -211,7 +217,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
                                        const OUString&                                       sPackage,
                                        const OUString&                                       sRelPath,
                                        const OUString&                                       sKey    ,
-                                             sal_Int32                                              eMode   );
+                                             EConfigurationModes                             eMode   );
 
 
     /** does the same then openConfig() / writeRelativeKey() & flush() together.
@@ -227,8 +233,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
                                const OUString&                                       sPackage,
                                const OUString&                                       sRelPath,
                                const OUString&                                       sKey    ,
-                               const css::uno::Any&                                         aValue  ,
-                                     sal_Int32                                              eMode   );
+                               const css::uno::Any&                                  aValue  ,
+                                     EConfigurationModes                             eMode   );
 };
 
 } // namespace comphelper
diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx
index 6e598c1a0143..6d3091d1e7e4 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -70,9 +70,8 @@ public:
     ConfigurationListener(const OUString &rPath,
                           css::uno::Reference< css::uno::XComponentContext >
                           const & xContext = comphelper::getProcessComponentContext())
-        : mxConfig( ConfigurationHelper::openConfig( xContext, rPath,
-                        ConfigurationHelper::EConfigurationModes::E_READONLY ),
-                  css::uno::UNO_QUERY_THROW )
+        : mxConfig( ConfigurationHelper::openConfig( xContext, rPath, EConfigurationModes::ReadOnly ),
+                    css::uno::UNO_QUERY_THROW )
     { }
 
     virtual ~ConfigurationListener()
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 7cab269f4929..607bec8282f5 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -85,7 +85,7 @@ VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContex
     {
         OSL_ENSURE( !rConfigCompName.isEmpty(), "VbaFilterConfig::VbaFilterConfig - invalid configuration component name" );
         OUString aConfigPackage = "org.openoffice.Office." + rConfigCompName;
-        mxConfigAccess = ConfigurationHelper::openConfig( rxContext, aConfigPackage, ConfigurationHelper::E_READONLY );
+        mxConfigAccess = ConfigurationHelper::openConfig( rxContext, aConfigPackage, comphelper::EConfigurationModes::ReadOnly );
     }
     catch(const Exception& )
     {
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 506bd1b427b8..e8716e3b2ab4 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2020,7 +2020,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
     try
     {
         xConfiguration = ConfigurationHelper::openConfig(
-            xContext, PACKAGE_SETUP, ConfigurationHelper::E_STANDARD );
+            xContext, PACKAGE_SETUP, EConfigurationModes::Standard );
         if ( xConfiguration.is() )
         {
             Any aAny = ConfigurationHelper::readRelativeKey( xConfiguration, sPath, sKey );
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 9443ac9a254e..f7cba15ac6be 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -197,7 +197,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU
         {
             uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
             uno::Reference< uno::XInterface > xConfig = ::comphelper::ConfigurationHelper::openConfig(
-                ::comphelper::getProcessComponentContext(), CONF_ROOT, ::comphelper::ConfigurationHelper::E_STANDARD );
+                ::comphelper::getProcessComponentContext(), CONF_ROOT, ::comphelper::EConfigurationModes::Standard );
 
             OUString aActualFilter;
             ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_ACTUAL_FILTER ) >>= aActualFilter;
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 338210c8309c..52b999b035cb 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -117,7 +117,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
             ::comphelper::ConfigurationHelper::openConfig(
                 comphelper::getProcessComponentContext(),
                 s_sAccessibility,
-                ::comphelper::ConfigurationHelper::E_STANDARD),
+                ::comphelper::EConfigurationModes::Standard ),
             css::uno::UNO_QUERY);
 
         bIsModified = false;
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index cb862f2ba8b2..20267cdbb0ac 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -124,7 +124,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
             ::comphelper::ConfigurationHelper::openConfig(
                 comphelper::getProcessComponentContext(),
                 ROOTNODE_PRINTOPTION,
-                ::comphelper::ConfigurationHelper::E_STANDARD),
+                ::comphelper::EConfigurationModes::Standard),
             css::uno::UNO_QUERY);
 
         if (m_xCfg.is())
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 134bee95d108..bb9d41d11b2a 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -110,14 +110,14 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
             ::comphelper::ConfigurationHelper::openConfig(
                 ::comphelper::getProcessComponentContext(),
                 s_sHistories,
-                ::comphelper::ConfigurationHelper::E_STANDARD),
+                ::comphelper::EConfigurationModes::Standard),
             uno::UNO_QUERY);
 
         m_xCommonXCU.set(
             ::comphelper::ConfigurationHelper::openConfig(
                 ::comphelper::getProcessComponentContext(),
                 s_sCommonHistory,
-                ::comphelper::ConfigurationHelper::E_STANDARD),
+                ::comphelper::EConfigurationModes::Standard),
             uno::UNO_QUERY);
     }
     catch(const uno::Exception& ex)
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index a4d2afee4075..cb6aa0bb5d56 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -130,7 +130,7 @@ SvtUserOptions::Impl::Impl() :
             comphelper::ConfigurationHelper::openConfig(
                 comphelper::getProcessComponentContext(),
                 "org.openoffice.UserProfile/Data",
-                comphelper::ConfigurationHelper::E_STANDARD
+                comphelper::EConfigurationModes::Standard
             ),
             uno::UNO_QUERY
         );
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 35c3fcd1a945..874f9f13df3d 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -157,7 +157,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList )
         m_xRoot.set( ::comphelper::ConfigurationHelper::openConfig(
                             ::comphelper::getProcessComponentContext(),
                             PACKAGE_VIEWS,
-                            ::comphelper::ConfigurationHelper::E_STANDARD),
+                            ::comphelper::EConfigurationModes::Standard),
                      css::uno::UNO_QUERY);
         if (m_xRoot.is())
             m_xRoot->getByName(sList) >>= m_xSet;