From c1758889cbd5e8e4afb1044425c908715eb3e1cd Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 11 Nov 2011 22:48:37 +0100
Subject: Heavily simplified utl::ConfigManager.

---
 xmlhelp/source/cxxhelp/provider/provider.cxx | 11 +----------
 xmlhelp/source/treeview/tvread.cxx           |  5 +----
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 35f84e133b04..33f6ba5ead8f 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -301,15 +301,6 @@ void ContentProvider::init()
     {
     }
 
-    /**
-     *  now determing
-     *  productname,
-     *  productversion,
-     */
-
-    rtl::OUString productname;
-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productname;
-
     xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
 
     rtl::OUString setupversion(
@@ -371,7 +362,7 @@ void ContentProvider::init()
     m_pDatabases = new Databases( showBasic,
                                   instPath,
                                   aImagesZipPaths,
-                                  productname,
+                                  utl::ConfigManager::getProductName(),
                                   productversion,
                                   stylesheet,
                                   xContext );
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 0640ee7dfe03..d23da1f75f0c 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -678,9 +678,6 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     /*                       reading setup                                */
     /**********************************************************************/
 
-    rtl::OUString productName;
-    ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productName;
-
     xHierAccess = getHierAccess( sProvider,
                                  "org.openoffice.Setup" );
 
@@ -803,7 +800,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     configData.m_vAdd[2] = 11;
     configData.m_vAdd[3] = 14;
     configData.m_vAdd[4] = 12;
-    configData.m_vReplacement[0] = productName;
+    configData.m_vReplacement[0] = utl::ConfigManager::getProductName();
     configData.m_vReplacement[1] = productVersion;
     // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
 
-- 
cgit