diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-11 15:20:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-12 15:34:49 +0100 |
| commit | 20658054d8bd6380b4b175b552ccc1480c49d01c (patch) | |
| tree | 24ae751e6c98027431d13295b8c17da7af4ce0cc /framework | |
| parent | d498765f6ef10cf720636b3dc702b07e7bf693ec (diff) | |
#i112786# make ConfigManager a well-behaved singleton
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 5 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index c4cc7149ab6d..5e682f36c056 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3698,9 +3698,8 @@ void AutoRecovery::impl_flushALLConfigChanges() // SOLAR SAFE -> ::vos::OGuard aGuard( Application::GetSolarMutex() ); - ::utl::ConfigManager* pCfgMgr = ::utl::ConfigManager::GetConfigManager(); - if (pCfgMgr) - pCfgMgr->StoreConfigItems(); + ::utl::ConfigManager& rCfgMgr = ::utl::ConfigManager::GetConfigManager(); + rCfgMgr.StoreConfigItems(); } catch(const css::uno::Exception&) {} diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index be1ba436d3de..82124cd89f24 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1205,7 +1205,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the language type of the current office aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US; rtl::OUString aLocaleStr; - if ( utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr ) + if ( utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr ) aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr ); else { |