Heavily simplified utl::ConfigManager.

4 files changed, 5 insertions, 14 deletions

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 598f41207190..6c5f7d50bc7e 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -127,7 +127,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
         xDesktop->removeTerminateListener( this );
 
     SolarMutexGuard aGuard;
-    utl::ConfigManager::GetConfigManager().StoreConfigItems();
+    utl::ConfigManager::storeConfigItems();
 
     SfxApplication* pApp = SFX_APP();
     pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index ff92bf9d7966..e3623820edb0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -123,14 +123,11 @@ static bool impl_hasHelpInstalled( const rtl::OUString &rLang );
 static rtl::OUString HelpLocaleString()
 {
     static rtl::OUString aLocaleStr;
-    if (!aLocaleStr.getLength())
+    if (aLocaleStr.isEmpty())
     {
         const rtl::OUString aEnglish( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
         // detect installed locale
-        Any aLocale =
-            ::utl::ConfigManager::GetConfigManager().GetDirectConfigProperty(
-               ::utl::ConfigManager::LOCALE );
-        aLocale >>= aLocaleStr;
+        aLocaleStr = utl::ConfigManager::getLocale();
         bool bOk = aLocaleStr.getLength() != 0;
         if ( !bOk )
             aLocaleStr = aEnglish;
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index dedc88f183b5..2e64e6633dee 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -504,10 +504,7 @@ void SfxDocTplService_Impl::getDefaultLocale()
         ::osl::MutexGuard aGuard( maMutex );
         if ( !mbLocaleSet )
         {
-            rtl::OUString aLocale;
-            utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::LOCALE )
-                >>= aLocale;
-
+            rtl::OUString aLocale( utl::ConfigManager::getLocale() );
             if ( aLocale.getLength() > 0 )
             {
                 sal_Int32 nPos = aLocale.indexOf( sal_Unicode( '-' ) );
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index e03206919106..33923ebfaa20 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -236,11 +236,8 @@ String SfxViewFrame::UpdateTitle()
     GetBindings().Invalidate( SID_FRAMETITLE );
     GetBindings().Invalidate( SID_CURRENT_URL );
 
-    ::rtl::OUString aProductName;
-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= aProductName;
-
     aTitle += String::CreateFromAscii( " - " );
-    aTitle += String(aProductName);
+    aTitle += utl::ConfigManager::getProductName();
     aTitle += ' ';
     ::rtl::OUString aDocServiceName( GetObjectShell()->GetFactory().GetDocumentServiceName() );
     aTitle += String( GetModuleName_Impl( aDocServiceName ) );