diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
| commit | c939070f709143482ce749603c0e1f0d84df443c (patch) | |
| tree | c7ed48d5fa87e8ec699f006f49404ce6aa538925 /xmlhelp/source/cxxhelp/provider/provider.cxx | |
| parent | a0f911669be348a5539687e4ebe25446d526b2a8 (diff) | |
| parent | 066ee33f2754e36cf7b6c39d2c2bff3b31f55951 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/provider.cxx')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 713e2596ac58..3707903062a6 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <unotools/configmgr.hxx> #include <rtl/bootstrap.hxx> #include "databases.hxx" @@ -306,9 +307,10 @@ void ContentProvider::init() * productversion, */ + rtl::OUString productname; + ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productname; + xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" ); - rtl::OUString productname( - getKey( xHierAccess,"Product/ooName" ) ); rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); |