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 | |
parent | cppcheck: the scope of this variable can be reduced (diff) | |
parent | Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) (diff) | |
download | core-c939070f709143482ce749603c0e1f0d84df443c.tar.gz core-c939070f709143482ce749603c0e1f0d84df443c.zip |
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')
-rw-r--r-- | xmlhelp/prj/build.lst | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 16 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/treeview/makefile.mk | 1 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 5 | ||||
-rw-r--r-- | xmlhelp/util/makefile.mk | 1 |
6 files changed, 20 insertions, 11 deletions
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst index 7430bf6d7ba9..00e285cde858 100644 --- a/xmlhelp/prj/build.lst +++ b/xmlhelp/prj/build.lst @@ -1,4 +1,4 @@ -xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools NULL +xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools unotools NULL xh xmlhelp usr1 - all xh_mkout NULL xh xmlhelp\inc nmake - all xh_inc NULL xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 98c3c387ad6d..bbd050177a79 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -311,13 +311,15 @@ namespace chelp { char* m_pCustomCSSDoc; rtl::OUString m_aCSS; -#define PRODUCTNAME 0 -#define PRODUCTVERSION 1 -#define VENDORNAME 2 -#define VENDORVERSION 3 -#define VENDORSHORT 4 -#define NEWPRODUCTNAME 5 -#define NEWPRODUCTVERSION 6 + enum { + PRODUCTNAME = 0, + PRODUCTVERSION, + VENDORNAME, + VENDORVERSION, + VENDORSHORT, + NEWPRODUCTNAME, + NEWPRODUCTVERSION + }; int m_vAdd[7]; rtl::OUString m_vReplacement[7]; 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" ) ); diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk index 0c385862d772..3dc65457016d 100644 --- a/xmlhelp/source/treeview/makefile.mk +++ b/xmlhelp/source/treeview/makefile.mk @@ -57,6 +57,7 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(COMPHELPERLIB) \ $(EXPATASCII3RDLIB) \ + $(UNOTOOLSLIB) \ $(SALLIB) SHL1VERSIONMAP=$(SOLARENV)/src/component.map diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 73fad53c9647..991e978862e1 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -36,6 +36,7 @@ #include "tvread.hxx" #include <expat.h> #include <osl/file.hxx> +#include <unotools/configmgr.hxx> #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -676,10 +677,12 @@ 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" ); - rtl::OUString productName( getKey( xHierAccess,"Product/ooName" ) ); rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); rtl::OUString setupextension; diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk index 66551f15bffc..5bc5bc690bac 100644 --- a/xmlhelp/util/makefile.mk +++ b/xmlhelp/util/makefile.mk @@ -59,6 +59,7 @@ SHL1STDLIBS= \ $(COMPHELPERLIB) \ $(SALLIB) \ $(EXPATASCII3RDLIB) \ + $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(BERKELEYLIB) \ $(XSLTLIB) |