diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-23 13:32:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-24 11:48:38 +0200 |
commit | 0839f90394d96cf0fe414913527b3e3e5ba3c86a (patch) | |
tree | b30ad360ae30797d9944453e6cface25db4c59c7 /framework | |
parent | a9a04f11a6b3938aa2d8d0f8f21a866c65b761da (diff) |
convert EConfigurationModes to scoped enum
Change-Id: I1e81c8d637e738f536f7efad8b67d0c9183e6483
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 6 | ||||
-rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 4 | ||||
-rw-r--r-- | framework/source/jobs/helponstartup.cxx | 6 | ||||
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 6 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 22 | ||||
-rw-r--r-- | framework/source/services/modulemanager.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 4 |
7 files changed, 26 insertions, 26 deletions
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 -> |