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 | a4d7dbf897e41a1afda6c2b6f0e5cc35920a1cf3 (patch) | |
| tree | 3cdd186f17cdbab6c002691ed2044d87d78d47db /desktop | |
| parent | 0708aa63dd280b345553f278b5a58a5676adafcc (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 fe33006431..36d5d203de 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(); } |