Attachment 40959 Details for Bug 31770 – Proposed fix for the help branding

[patch] Proposed fix for the help branding

br-xmlhelp.diff (text/plain), 4.04 KB, created by Petr Mladek on 2010-12-09 11:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Mladek

Created: 2010-12-09 11:40:05 UTC

Size: 4.04 KB

patch

obsolete

>--- xmlhelp/source/treeview/tvread.cxx.old	2010-11-11 20:08:59.000000000 +0100
>+++ xmlhelp/source/treeview/tvread.cxx	2010-12-09 20:11:10.000000000 +0100
>@@ -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 Re
>     /*                       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;
> 
>--- xmlhelp/source/treeview/makefile.mk.old	2010-11-11 16:30:08.000000000 +0100
>+++ xmlhelp/source/treeview/makefile.mk	2010-12-09 20:11:10.000000000 +0100
>@@ -57,6 +57,7 @@ SHL1STDLIBS=\
>     $(CPPULIB) \
>     $(COMPHELPERLIB)         \
>     $(EXPATASCII3RDLIB)      \
>+    $(UNOTOOLSLIB)	     \
>     $(SALLIB)  
> SHL1VERSIONMAP=$(SOLARENV)/src/component.map
> 
>--- xmlhelp/source/cxxhelp/provider/provider.cxx.old	2010-11-11 20:08:59.000000000 +0100
>+++ xmlhelp/source/cxxhelp/provider/provider.cxx	2010-12-09 20:28:42.000000000 +0100
>@@ -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" ) );
>--- xmlhelp/source/cxxhelp/provider/databases.hxx.old	2010-11-11 16:30:08.000000000 +0100
>+++ xmlhelp/source/cxxhelp/provider/databases.hxx	2010-12-09 20:14:05.000000000 +0100
>@@ -310,14 +310,16 @@ namespace chelp {
>         int    m_nCustomCSSDocLength;
>         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];
>--- xmlhelp/prj/build.lst.old	2010-11-11 16:30:08.000000000 +0100
>+++ xmlhelp/prj/build.lst	2010-12-09 20:26:31.000000000 +0100
>@@ -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
>--- xmlhelp/util/makefile.mk.old	2010-11-11 16:30:08.000000000 +0100
>+++ xmlhelp/util/makefile.mk	2010-12-09 20:11:10.000000000 +0100
>@@ -59,6 +59,7 @@ SHL1STDLIBS=                     \
>     $(COMPHELPERLIB)         \
>     $(SALLIB)                \
>     $(EXPATASCII3RDLIB)      \
>+    $(UNOTOOLSLIB)           \
>     $(UCBHELPERLIB)          \
>         $(BERKELEYLIB)           \
>         $(XSLTLIB)

Actions: View

Attachments on bug 31770: 40410 | 40680 | 40959