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 /desktop | |
| parent | d498765f6ef10cf720636b3dc702b07e7bf693ec (diff) | |
#i112786# make ConfigManager a well-behaved singleton
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 689b808fac75..fe9be77b4ab4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -747,7 +747,7 @@ void Desktop::DeInit() try { // instead of removing of the configManager just let it commit all the changes RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + utl::ConfigManager::GetConfigManager().StoreConfigItems(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); // close splashscreen if it's still open @@ -777,7 +777,7 @@ BOOL Desktop::QueryExit() try { RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); - utl::ConfigManager::GetConfigManager()->StoreConfigItems(); + utl::ConfigManager::GetConfigManager().StoreConfigItems(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- store config items" ); } catch ( RuntimeException& ) @@ -1431,14 +1431,14 @@ USHORT Desktop::Exception(USHORT nError) bRestart = SaveTasks(); // because there is no method to flush the condiguration data, we must dispose the ConfigManager - Reference < XFlushable > xCFGFlush( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); + Reference < XFlushable > xCFGFlush( ::utl::ConfigManager::GetConfigManager().GetConfigurationProvider(), UNO_QUERY ); if (xCFGFlush.is()) { xCFGFlush->flush(); } else { - Reference < XComponent > xCFGDispose( ::utl::ConfigManager::GetConfigManager()->GetConfigurationProvider(), UNO_QUERY ); + Reference < XComponent > xCFGDispose( ::utl::ConfigManager::GetConfigManager().GetConfigurationProvider(), UNO_QUERY ); if (xCFGDispose.is()) xCFGDispose->dispose(); } |