Heavily simplified utl::ConfigManager.

4 files changed, 10 insertions, 17 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0fae48f193b8..de19df3769cf 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1717,13 +1717,9 @@ void SvxConfigPage::Reset( const SfxItemSet& )
 
         if ( pModuleData != NULL )
         {
-            OUString label;
-            utl::ConfigManager::GetDirectConfigProperty(
-                utl::ConfigManager::PRODUCTNAME ) >>= label;
-            label += OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
-            label += aModuleName;
-
-            nPos = aSaveInListBox.InsertEntry( label );
+            nPos = aSaveInListBox.InsertEntry(
+                utl::ConfigManager::getProductName() +
+                OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) + aModuleName );
             aSaveInListBox.SetEntryData( nPos, pModuleData );
         }
 
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 7b4c04edbae6..2fbb572241fe 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -101,10 +101,8 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
     if ( xSupplier.is() )
     {
         m_xAppEvents = xSupplier->getEvents();
-        OUString label;
-        utl::ConfigManager::GetDirectConfigProperty(
-            utl::ConfigManager::PRODUCTNAME ) >>= label;
-        nPos = aSaveInListBox.InsertEntry( label );
+        nPos = aSaveInListBox.InsertEntry(
+            utl::ConfigManager::getProductName() );
         aSaveInListBox.SetEntryData( nPos, new bool(true) );
         aSaveInListBox.SelectEntryPos( nPos, sal_True );
     }
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index b987b4af08ed..03555748f12d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -114,9 +114,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     m_aLinkStr(ResId( ABOUT_STR_LINK, *rId.GetResMgr())),
     m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))
 {
-    rtl::OUString sProduct;
-    utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct;
-
     // load image from module path
     aAppLogo = SfxApplication::GetApplicationLogo();
 
@@ -162,8 +159,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
     rtl::OUStringBuffer sText(m_aVendorTextStr);
     sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
-    sal_uInt32 nCopyrightId = sProduct.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LibreOffice" )) ?
-        ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
+    sal_uInt32 nCopyrightId =
+        utl::ConfigManager::getProductName().equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("LibreOffice"))
+        ? ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
     String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr()));
     sText.append(aProductCopyrightTextStr);
     sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 89855ac28fa4..d5f48812e779 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2586,7 +2586,7 @@ short OfaTreeOptionsDialog::Execute()
         ApplyItemSets();
         if( mpColorPage )
             mpColorPage->SaveToViewFrame( SfxViewFrame::Current() );
-        utl::ConfigManager::GetConfigManager().StoreConfigItems();
+        utl::ConfigManager::storeConfigItems();
     }
 
     return nRet;