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 | a82b0f10deff1da74357c252916e8c57dbc3ee80 (patch) | |
| tree | 92a421d8ff477368583ef2eab6d89b65ef118e85 /xmlhelp/source | |
| parent | 1ff713b531fb21ecb5b139fcc152fe54e663ae6e (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/source')
| -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 39bf656dd7e3..63f6d4649aa7 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 ); |