diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:36:35 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:36:35 +0000 |
commit | 3cc4196018a7e11fc94e693a5ecb409d442fb1c9 (patch) | |
tree | 00c2df5fe835bfbf810ce4df774a82dd4bf8c484 /xmlhelp | |
parent | 7ef4894ee569b0f4fd0175e297f8999c61139d81 (diff) |
INTEGRATION: CWS sb90 (1.24.10); FILE MERGED
2008/06/25 12:24:47 sb 1.24.10.1: #157787# replaced direct access to ooSetupExtension configuration data with utl::ConfigManager::PRODUCTEXTENSION (which transparently does the EDITIONNAME hack; see there)
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index d4c059c571..3938adb683 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tvread.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.26 $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,7 @@ #include <expat/xmlparse.h> #endif #include <osl/file.hxx> +#include <unotools/configmgr.hxx> #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -705,7 +706,12 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) rtl::OUString productName( getKey( xHierAccess,"Product/ooName" ) ); setupversion = getKey( xHierAccess,"Product/ooSetupVersion" ); - setupextension = getKey( xHierAccess,"Product/ooSetupExtension"); + setupextension = rtl::OUString(); + utl::ConfigManager * mgr = utl::ConfigManager::GetConfigManager(); + if (mgr != NULL) { + mgr->GetDirectConfigProperty(utl::ConfigManager::PRODUCTEXTENSION) >>= + setupextension; + } rtl::OUString productVersion( setupversion + rtl::OUString::createFromAscii( " " ) + setupextension ); |