[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/extras_wizard.diff |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 985d8c954d3da2c22950d627d25fd0f06a7d6d90
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sun Jun 7 10:03:43 2009 +0200

    Fix OOoWikipedia incompatibility with OOOP3.1 (only OxygenOffice is affected)
    
    * patches/dev300/extras_wizard.diff:

diff --git a/patches/dev300/extras_wizard.diff b/patches/dev300/extras_wizard.diff
index 90619d9..9e112e2 100644
--- a/patches/dev300/extras_wizard.diff
+++ b/patches/dev300/extras_wizard.diff
@@ -108,7 +108,7 @@ diff -Naur -x .svn wizards/source/ooowikipedia/makefile.mk wizards/source/ooowik
 diff -Naur -x .svn wizards/source/ooowikipedia/Module1.xba wizards/source/ooowikipedia/Module1.xba
 --- wizards/source/ooowikipedia/Module1.xba	1970-01-01 01:00:00.000000000 +0100
 +++ wizards/source/ooowikipedia/Module1.xba	2007-01-09 18:36:58.000000000 +0100
-@@ -0,0 +1,588 @@
+@@ -0,0 +1,581 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">const DefaultWiki=2
@@ -590,13 +590,6 @@ diff -Naur -x .svn wizards/source/ooowikipedia/Module1.xba wizards/source/ooowik
 +if (getSolarVersion = 680) OR (getSolarVersion = 300) then
 +	&apos;OOo 2
 +	checkHTTP = true
-+else
-+	&apos;OOo 1.1.x
-+	aConfigProvider = createUnoService( &quot;com.sun.star.configuration.ConfigurationProvider&quot; )
-+	aParams2(0).Name = &quot;nodepath&quot;
-+	aParams2(0).Value = &quot;/org.openoffice.Office.Common/ExternalApps/&quot;
-+	aSettings = aConfigProvider.createInstanceWithArguments( &quot;com.sun.star.configuration.ConfigurationUpdateAccess&quot;, aParams2() )
-+	checkHTTP=(trim(aSettings.http)&lt;&gt;&quot;&quot;)
 +endif
 +
 +end Function