This commit was manufactured by cvs2svn to create tagOOO_BUILD_2_0_0_2

'OOO_BUILD_2_0_0_2'.

12 files changed, 1594 insertions, 36 deletions

diff --git a/bin/oowintool b/bin/oowintool
index 7495058e5..d645932dc 100755
--- a/bin/oowintool
+++ b/bin/oowintool
@@ -24,6 +24,17 @@ sub reg_get_value($)
     return $value;
 }
 
+sub reg_find_key($)
+{
+    # it is believed that the registry moves keys around
+    # depending on OS version, this will de-mangle that
+    my $key = shift;
+    $key =~ s| |\\ |;
+    $key = `cd /proc/registry/ ; ls $key`;
+
+    return $key;
+}
+
 sub print_syntax()
 {
     print "oowintool [option] ...\n";
@@ -33,10 +44,14 @@ sub print_syntax()
     print " commands:\n";
     print "   --msvc-ver              - dump version of MSVC eg. 6.0\n";
     print "   --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
+    print "   --msvc-copy-instmsi <dest> - copy instmsia.exe, insmsiw.exe into <dest>\n";
     print "   --msvc-productdir       - dump productdir\n";
+    print "   --msvs-productdir       - dump productdir\n";
+    print "   --dotnetsdk-dir         - dump .Net SDK path\n";
     print "   --csc-compilerdir       - dump .Net SDK compiler path\n";
     print "   --psdk-home             - dump psdk install dir\n";
     print "   --jdk-home              - dump the jdk install dir\n";
+    print "   --nsis-dir              - dump NSIS path\n";
     print "   --help                  - this message\n";
 }
 
@@ -78,6 +93,11 @@ sub print_psdk_home()
 {
     my $value;
     $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
+    if (!defined $value)
+    {
+        $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
+        $value = reg_get_value ($key);
+    }
     defined $value || die "psdk not found";
 
     print cygpath ($value, 'w', $output_format);
@@ -87,22 +107,60 @@ my %msvc6 = (
     'ver' => '6.0',
     'key' => 'Microsoft/VisualStudio/6.0/Setup/Microsoft Visual C++/ProductDir',
 );
-my %msvs_net_2002 = (
+my %msvc_net_2002 = (
     'ver' => '7.0',
     'key' => 'Microsoft/VisualStudio/7.0/Setup/VC/ProductDir',
+    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
     'dll_path' => '../Visual Studio .NET Professional - English', # testme ...
     'dll_suffix' => '70'
 );
-my %msvs_net_2003 = (
+my %msvs_net_2002 = (
+    'ver' => '7.0',
+    'key' => 'Microsoft/VisualStudio/7.0/Setup/VS/ProductDir',
+    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+    'dll_path' => 'Visual Studio .NET Professional - English', # testme ...
+    'dll_suffix' => '70'
+);
+my %msvc_net_2003 = (
     'ver' => '7.1',
     'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
+    'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
     'dll_path' => '../SDK/v1.1/Bin',
     'dll_suffix' => '71'
 );
+my %msvs_net_2003 = (
+    'ver' => '7.1',
+    'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
+    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+    'dll_path' => 'Visual Studio .NET Professional 2003 - English', # testme ...
+    'dll_suffix' => '71'
+);
+my %msvs_net_2003_ea = (
+    'ver' => '7.1',
+    'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
+    'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+    'dll_path' => 'Visual Studio .NET Enterprise Architect 2003 - English', # testme ...
+    'dll_suffix' => '71'
+);
 
 sub find_msvs()
 {
-    my @ms_versions = ( \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+    my @ms_versions = ( \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+
+    for $ver (@ms_versions)
+    {
+	my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
+	if (defined $install && $install ne '') {
+	    $ver->{'product_dir'} = $install;
+	    return $ver;
+	}
+    }
+    die "Can't find MS Visual Studio / VC++";
+}
+
+sub find_msvc()
+{
+    my @ms_versions = ( \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
 
     for $ver (@ms_versions)
     {
@@ -117,12 +175,18 @@ sub find_msvs()
 
 sub print_msvc_ver()
 {
-    my $ver = find_msvs();
+    my $ver = find_msvc();
     print $ver->{'ver'};
 }
 
 sub print_msvc_product_dir()
 {
+    my $ver = find_msvc();
+    print cygpath ($ver->{'product_dir'}, 'w', $output_format);
+}
+
+sub print_msvs_productdir()
+{
     my $ver = find_msvs();
     print cygpath ($ver->{'product_dir'}, 'w', $output_format);
 }
@@ -134,12 +198,24 @@ sub print_csc_compiler_dir()
     print cygpath ($dir, 'w', $output_format);
 }
 
+sub print_dotnetsdk_dir()
+{
+    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1");
+    print cygpath ($dir, 'w', $output_format);
+}
+
 sub print_jdk_dir()
 {
     my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome");
     print cygpath($dir, 'w', $output_format); 
 }
 
+sub print_nsis_dir()
+{
+    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@");
+    print cygpath ($dir, 'w', $output_format);
+}
+
 sub copy_dll($$$)
 {
     my ($src, $fname, $dest) = @_;
@@ -151,13 +227,25 @@ sub copy_dll($$$)
     chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
 }
 
+sub msvc_find_version($)
+{
+    my $checkpath = shift;
+    my $ver = find_msvc();
+    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+		  $ver->{$checkpath});
+    -d $srcdir && return $ver;
+    $ver = find_msvs();
+    $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+		  $ver->{$checkpath});
+    -d $srcdir && return $ver;
+    return "";
+}
+
 sub msvc_copy_dlls($)
 {
     my $dest = shift;
-    my $ver = find_msvs();
-
-    defined $ver->{'dll_path'} || return;
-
+    my $ver = msvc_find_version('dll_path');
+    defined $ver || return;
     my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
 		  $ver->{'dll_path'});
 
@@ -167,6 +255,20 @@ sub msvc_copy_dlls($)
 	      $dest . $ver->{'dll_suffix'});
 }
 
+sub msvc_copy_instmsi($)
+{
+    my $dest = shift;
+    my $ver = msvc_find_version('instmsi_path');
+    defined $ver || return;
+    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+		  $ver->{'instmsi_path'});
+
+    copy_dll ($srcdir, "instmsia.exe",
+	      $dest);
+    copy_dll ($srcdir, "instmsiw.exe",
+	      $dest);
+}
+
 if (!@ARGV) {
     print_syntax();
     exit 1;
@@ -194,14 +296,24 @@ while (@commands) {
 	my $dest = shift @commands;
 	defined $dest || die "copy-dlls requires a destination directory";
 	msvc_copy_dlls( $dest );
+    } elsif ($opt eq '--msvc-copy-instmsi') {
+	my $dest = shift @commands;
+	defined $dest || die "copy-instmsi requires a destination directory";
+	msvc_copy_instmsi( $dest );
+    } elsif ($opt eq '--msvs-productdir') {
+	print_msvs_productdir();
     } elsif ($opt eq '--msvc-productdir') {
 	print_msvc_product_dir();
+    } elsif ($opt eq '--dotnetsdk-dir') {
+	print_dotnetsdk_dir();
     } elsif ($opt eq '--csc-compilerdir') {
 	print_csc_compiler_dir();
     } elsif ($opt eq '--psdk-home') {
 	print_psdk_home();
     } elsif ($opt eq '--jdk-home') {
 	print_jdk_dir();
+    } elsif ($opt eq '--nsis-dir') {
+	print_nsis_dir();
     } elsif ($opt eq '--help' || $opt eq '/?') {
 	print_syntax();
     } else {
diff --git a/desktop/openoffice.keys.in b/desktop/openoffice.keys.in
new file mode 100644
index 000000000..ada28fcfc
--- /dev/null
+++ b/desktop/openoffice.keys.in
@@ -0,0 +1,120 @@
+application/vnd.oasis.opendocument.database
+	description=OpenDocument Database
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents
+	use_category_default=no
+	icon_filename=oasis-database
+
+application/vnd.oasis.opendocument.graphics
+	description=OpenDocument Drawing
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents
+	use_category_default=no
+	icon_filename=oasis-drawing
+
+application/vnd.oasis.opendocument.graphics-template
+	description=OpenDocument Drawing Template
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents
+	use_category_default=no
+	icon_filename=oasis-drawing-template
+
+application/vnd.oasis.opendocument.formula
+	description=OpenDocument Formula
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents
+	use_category_default=no
+	icon_filename=oasis-formula
+
+application/vnd.oasis.opendocument.text-master
+	description=OpenDocument Master Document
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Word Processor
+	use_category_default=yes
+	icon_filename=oasis-master-document
+
+application/vnd.oasis.opendocument.presentation
+	description=OpenDocument Presentation
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Presentation
+	use_category_default=yes
+	icon_filename=oasis-presentation
+
+application/vnd.oasis.opendocument.presentation-template
+	description=OpenDocument Presentation Template
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Presentation
+	use_category_default=yes
+	icon_filename=oasis-presentation-template
+
+application/vnd.oasis.opendocument.spreadsheet
+	description=OpenDocument Spreadsheet
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Spreadsheet
+	use_category_default=yes
+	icon_filename=oasis-spreadsheet
+
+application/vnd.oasis.opendocument.spreadsheet-template
+	description=OpenDocument Spreadsheet Template
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Spreadsheet
+	use_category_default=yes
+	icon_filename=oasis-spreadsheet-template
+
+application/vnd.oasis.opendocument.text
+	description=OpenDocument Text
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Word Processor
+	use_category_default=yes
+	icon_filename=oasis-text
+
+application/vnd.oasis.opendocument.text-template
+	description=OpenDocument Text Template
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Word Processor
+	use_category_default=yes
+	icon_filename=oasis-text-template
+
+application/vnd.oasis.opendocument.text-web
+	description=HTML Document Template
+	default_action_type=application
+	short_list_application_ids_for_novice_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_intermediate_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	short_list_application_ids_for_advanced_user_level=openoffice@BINSUFFIX@,staroffice,starsuite
+	category=Documents/Word Processor
+	use_category_default=yes
+	icon_filename=oasis-web-template
+
diff --git a/distro-configs/Frugalware.conf.in b/distro-configs/Frugalware.conf.in
new file mode 100644
index 000000000..fdb82051e
--- /dev/null
+++ b/distro-configs/Frugalware.conf.in
@@ -0,0 +1,18 @@
+--with-lang=ALL
+--with-ccache-allowed
+--with-db-version=4.3
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-neon
+--with-system-sndfile
+--with-system-odbc-headers
+--without-java
+--without-binsuffix
+--enable-libart
+--enable-libsn
+--enable-fontconfig
+--enable-gnome-vfs
+--enable-kde
+--enable-gtk
+--enable-crashdump=yes
diff --git a/patches/src680/disable-rhino-without-system-bsh.diff b/patches/src680/disable-rhino-without-system-bsh.diff
new file mode 100644
index 000000000..48a2b9160
--- /dev/null
+++ b/patches/src680/disable-rhino-without-system-bsh.diff
@@ -0,0 +1,875 @@
+--- scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java	2005-10-15 13:15:51.865567480 +0200
++++ /dev/null	2005-03-29 00:33:24.000000000 +0200
+@@ -1,417 +0,0 @@
+-/************************************************************************* 
+-*
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile: ScriptProviderForJavaScript.java,v $
+- *
+- *  $Revision: 1.8 $
+- *
+- *  last change: $Author: rt $ $Date: 2005/09/09 02:05:15 $
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+-************************************************************************/
+-package com.sun.star.script.framework.provider.javascript;
+-
+-import com.sun.star.uno.UnoRuntime;
+-import com.sun.star.uno.XComponentContext;
+-import com.sun.star.lang.XMultiComponentFactory;
+-import com.sun.star.lang.XMultiServiceFactory;
+-import com.sun.star.lang.XSingleServiceFactory;
+-import com.sun.star.frame.XModel;
+-import com.sun.star.registry.XRegistryKey;
+-import com.sun.star.comp.loader.FactoryHelper;
+-import com.sun.star.lang.XTypeProvider;
+-import com.sun.star.lang.XServiceInfo;
+-import com.sun.star.lang.XInitialization;
+-import com.sun.star.uno.AnyConverter;
+-import com.sun.star.uno.Type;
+-import com.sun.star.uno.Any;
+-import com.sun.star.beans.XPropertySet;
+-
+-import com.sun.star.lang.IllegalArgumentException;
+-import com.sun.star.lang.WrappedTargetException;
+-import com.sun.star.reflection.InvocationTargetException;
+-import com.sun.star.script.CannotConvertException;
+-
+-import java.io.*;
+-import java.util.Vector;
+-import java.util.Map;
+-import java.net.MalformedURLException;
+-import java.net.URL;
+-
+-import com.sun.star.script.provider.XScriptProvider;
+-import com.sun.star.script.provider.XScript;
+-import com.sun.star.script.provider.XScriptContext;
+-
+-import com.sun.star.script.provider.ScriptErrorRaisedException;
+-import com.sun.star.script.provider.ScriptExceptionRaisedException;
+-import com.sun.star.script.provider.ScriptFrameworkErrorException;
+-import com.sun.star.script.provider.ScriptFrameworkErrorType;
+-
+-import com.sun.star.script.framework.log.LogUtils;
+-import com.sun.star.script.framework.provider.ScriptContext;
+-import com.sun.star.script.framework.provider.ClassLoaderFactory;
+-import com.sun.star.script.framework.provider.ScriptProvider;
+-import com.sun.star.script.framework.provider.ScriptEditor;
+-import com.sun.star.script.framework.container.ScriptMetaData;
+-import com.sun.star.script.framework.log.*;
+-
+-import org.mozilla.javascript.Context;
+-import org.mozilla.javascript.ImporterTopLevel;
+-import org.mozilla.javascript.Scriptable;
+-import org.mozilla.javascript.JavaScriptException;
+-import org.mozilla.javascript.EcmaError;
+-
+-public class ScriptProviderForJavaScript
+-{
+-    public static class _ScriptProviderForJavaScript extends ScriptProvider
+-    {
+-        public _ScriptProviderForJavaScript(XComponentContext ctx)
+-        {
+-            super(ctx, "JavaScript");
+-        }
+-
+-        public XScript getScript( /*IN*/String scriptURI )
+-            throws com.sun.star.uno.RuntimeException,
+-                   ScriptFrameworkErrorException
+-        {
+-            ScriptMetaData scriptData = null;
+-            try
+-            {
+-                scriptData = getScriptData( scriptURI );
+-                ScriptImpl script = new ScriptImpl( m_xContext, scriptData, m_xModel );
+-                return script;
+-            }
+-            catch ( com.sun.star.uno.RuntimeException re )
+-            {
+-                throw new ScriptFrameworkErrorException( "Failed to create script object: " + re.getMessage(), 
+-                    null, scriptData.getLanguageName(), language, ScriptFrameworkErrorType.UNKNOWN );
+-            }
+-        }
+-
+-        public boolean hasScriptEditor()
+-        {
+-            return true;
+-        }
+-
+-        public ScriptEditor getScriptEditor()
+-        {
+-            return ScriptEditorForJavaScript.getEditor();
+-        }
+-    }
+-
+-    /**
+-     * Returns a factory for creating the service.
+-     * This method is called by the <code>JavaLoader</code>
+-     * <p>
+-     *
+-     * @param  implName      the name of the implementation for which a service is desired
+-     * @param  multiFactory  the service manager to be used if needed
+-     * @param  regKey        the registryKey
+-     * @return               returns a <code>XSingleServiceFactory</code> for creating
+-     *                          the component
+-     * @see                  com.sun.star.comp.loader.JavaLoader
+-     */
+-    public static XSingleServiceFactory __getServiceFactory( String implName,
+-            XMultiServiceFactory multiFactory,
+-            XRegistryKey regKey )
+-    {
+-        XSingleServiceFactory xSingleServiceFactory = null;
+-
+-        if ( implName.equals( ScriptProviderForJavaScript._ScriptProviderForJavaScript.class.getName() ) )
+-        {
+-            xSingleServiceFactory = FactoryHelper.getServiceFactory(
+-                ScriptProviderForJavaScript._ScriptProviderForJavaScript.class,
+-                "com.sun.star.script.provider.ScriptProviderForJavaScript",
+-                multiFactory,
+-                regKey );
+-        }
+-
+-        return xSingleServiceFactory;
+-    }
+-
+-
+-    /**
+-     * Writes the service information into the given registry key.
+-     * This method is called by the <code>JavaLoader</code>
+-     * <p>
+-     *
+-     * @param  regKey  the registryKey
+-     * @return         returns true if the operation succeeded
+-     * @see            com.sun.star.comp.loader.JavaLoader
+-     */
+-    public static boolean __writeRegistryServiceInfo( XRegistryKey regKey )
+-    {
+-        String impl = "com.sun.star.script.framework.provider.javascript." +
+-            "ScriptProviderForJavaScript$_ScriptProviderForJavaScript";
+-
+-        String service1 = "com.sun.star.script.provider." +
+-            "ScriptProvider";
+-        String service2 = "com.sun.star.script.provider." +
+-            "LanguageScriptProvider";
+-        String service3 = "com.sun.star.script.provider." +
+-            "ScriptProviderForJavaScript";
+-        String service4 = "com.sun.star.script.browse." +
+-            "BrowseNode";
+-
+-        if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
+-            FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
+-            FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
+-            FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
+-        {
+-                return true;
+-        }
+-        return false;
+-    }
+-}
+-class ScriptImpl implements XScript
+-{
+-    private ScriptMetaData metaData;
+-    private XComponentContext m_xContext;
+-    private XMultiComponentFactory m_xMultiComponentFactory;
+-    private XModel m_xModel;
+-
+-    ScriptImpl( XComponentContext ctx, ScriptMetaData metaData, XModel xModel ) throws com.sun.star.uno.RuntimeException
+-    {
+-        this.metaData = metaData;
+-        this.m_xContext = ctx;
+-        this.m_xModel = xModel;
+-        try
+-        {
+-            this.m_xMultiComponentFactory = m_xContext.getServiceManager();
+-        }
+-        catch ( Exception e )
+-        {
+-            LogUtils.DEBUG( LogUtils.getTrace( e ) );
+-            throw new com.sun.star.uno.RuntimeException(
+-                "Error constructing  ScriptImpl: [javascript]");
+-        }
+-        LogUtils.DEBUG("ScriptImpl [javascript] script data = " + metaData );
+-    }
+-
+-        /**
+-         *  The invoke method of the ScriptProviderForJavaScript runs the
+-         *  JavaScript script specified in the URI
+-         *
+-         *
+-         *
+-         * @param aParams           All parameters; pure, out params are
+-         *                          undefined in sequence, i.e., the value
+-         *                          has to be ignored by the callee
+-         *
+-         * @param aOutParamIndex    Out indices
+-         *
+-         * @param aOutParam         Out parameters
+-         *
+-         * @returns                 The value returned from the function
+-         *                          being invoked
+-         *
+-         * @throws ScriptFrameworkErrorException If there is no matching script name
+-         *
+-         *
+-         * @throws InvocationTargetException If the running script throws
+-         *                                   an exception this information
+-         *                                   is captured and rethrown as
+-         *                                   ScriptErrorRaisedException or
+-         *                                   ScriptExceptionRaisedException
+-         */
+-
+-        public Object invoke(  
+-                               /*IN*/Object[]  params,
+-                               /*OUT*/short[][]  aOutParamIndex,
+-                               /*OUT*/Object[][]  aOutParam )
+-
+-        throws ScriptFrameworkErrorException, InvocationTargetException
+-        {
+-            // Initialise the out paramters - not used at the moment
+-            aOutParamIndex[0] = new short[0];
+-            aOutParam[0] = new Object[0];
+-
+-
+-
+-            ClassLoader cl = null;
+-            URL sourceUrl = null;
+-            try {
+-                cl = ClassLoaderFactory.getURLClassLoader( metaData );
+-                sourceUrl = metaData.getSourceURL();
+-            }
+-            catch ( java.net.MalformedURLException mfu )
+-            {
+-                throw new ScriptFrameworkErrorException( 
+-                    mfu.getMessage(), null, 
+-                    metaData.getLanguageName(), metaData.getLanguage(),
+-                    ScriptFrameworkErrorType.UNKNOWN );
+-            }
+-            catch ( com.sun.star.script.framework.provider.NoSuitableClassLoaderException nsc )
+-            {
+-                // Framework error
+-                throw new ScriptFrameworkErrorException( 
+-                    nsc.getMessage(), null,
+-                    metaData.getLanguageName(), metaData.getLanguage(),
+-                    ScriptFrameworkErrorType.UNKNOWN );
+-            }
+-            Context ctxt = null;
+-
+-            try 
+-            { 
+-                String editorURL = sourceUrl.toString();
+-                Object result = null;
+-                String source = null;
+-                ScriptEditorForJavaScript editor =
+-                    ScriptEditorForJavaScript.getEditor(
+-                        metaData.getSourceURL() );
+-
+-                if (editor != null)
+-                {
+-                    editorURL = editor.getURL();
+-                    result = editor.execute();
+-                    if ( result != null  && 
+-                         result.getClass().getName().equals( "org.mozilla.javascript.Undefined" ) )
+-                    {
+-                        // Always return a string
+-                        // TODO revisit
+-                        return Context.toString( result );
+-                    }
+-    
+-                }
+-
+-                if (editor != null && editor.isModified() == true)
+-                {
+-                    LogUtils.DEBUG("GOT A MODIFIED SOURCE");
+-                    source = editor.getText();
+-                }
+-                else
+-                {
+-                    metaData.loadSource();
+-                    source =  metaData.getSource();
+-
+-                }
+-
+-                if ( source == null || source.length() == 0 ) {
+-                    throw new ScriptFrameworkErrorException( 
+-                        "Failed to read source data for script", null,
+-                        metaData.getLanguageName(), metaData.getLanguage(),
+-                        ScriptFrameworkErrorType.UNKNOWN );
+-                }
+-
+-                /* Set the context ClassLoader on the current thread to
+-                   be our custom ClassLoader. This is the suggested method
+-                   for setting up a ClassLoader to be used by the Rhino
+-                   interpreter
+-                 */
+-                if (cl != null) {
+-                    Thread.currentThread().setContextClassLoader(cl);
+-                }
+-
+-                // Initialize a Rhino Context object
+-                ctxt = Context.enter();
+-
+-                /* The ImporterTopLevel ensures that importClass and
+-                   importPackage statements work in Javascript scripts
+-                   Make the XScriptContext available as a global variable
+-                   to the script
+-                 */
+-                ImporterTopLevel scope = new ImporterTopLevel(ctxt);
+-
+-                Scriptable jsCtxt = Context.toObject(
+-                   ScriptContext.createContext(
+-                       m_xModel, m_xContext,
+-                       m_xMultiComponentFactory), scope);
+-                scope.put("XSCRIPTCONTEXT", scope, jsCtxt);
+-
+-                Scriptable jsArgs = Context.toObject(params, scope);
+-                scope.put("ARGUMENTS", scope, jsArgs);
+-
+-                result = ctxt.evaluateString(scope,
+-                        source, "<stdin>", 1, null);
+-                result = ctxt.toString(result);
+-				return result;
+-            }
+-            catch (JavaScriptException jse) {
+-                LogUtils.DEBUG( "Caught JavaScriptException exception for JavaScript type = " + jse.getClass() );
+-                String message = jse.getMessage();
+-                //int lineNo = jse.getLineNumber();
+-                Object wrap = jse.getValue();
+-                LogUtils.DEBUG( "\t message  " + message );
+-                LogUtils.DEBUG( "\t wrapped type " + wrap.getClass() );
+-                LogUtils.DEBUG( "\t wrapped toString  " + wrap.toString() );
+-                ScriptExceptionRaisedException se = new 
+-                    ScriptExceptionRaisedException( message );
+-                se.lineNum = -1;
+-                se.language = "JavaScript";
+-                se.scriptName = metaData.getLanguageName();
+-                se.exceptionType = wrap.getClass().getName();
+-                se.language = metaData.getLanguage();
+-                LogUtils.DEBUG( "ExceptionRaised exception  "  );
+-                LogUtils.DEBUG( "\t message  " + se.getMessage() );
+-                LogUtils.DEBUG( "\t lineNum  " + se.lineNum );
+-                LogUtils.DEBUG( "\t language  " + se.language );
+-                LogUtils.DEBUG( "\t scriptName  " + se.scriptName );
+-                raiseEditor( se.lineNum );
+-                throw new InvocationTargetException( "JavaScript uncaught exception" + metaData.getLanguageName(), null, se );
+-            }
+-            catch (Exception ex) {
+-                LogUtils.DEBUG("Caught Exception " + ex );
+-                LogUtils.DEBUG("rethrowing as ScriptFramework error"  );
+-                throw new ScriptFrameworkErrorException( 
+-                    ex.getMessage(), null,
+-                    metaData.getLanguageName(), metaData.getLanguage(),
+-                    ScriptFrameworkErrorType.UNKNOWN );
+-            }
+-            finally {
+-                if ( ctxt != null )
+-                {
+-                    Context.exit();
+-                }
+-            }
+-        }
+-
+-        private void raiseEditor( int lineNum )
+-        {
+-            ScriptEditorForJavaScript editor = null;
+-            try
+-            {
+-                URL sourceUrl = metaData.getSourceURL(); 
+-                editor = ScriptEditorForJavaScript.getEditor( sourceUrl );
+-                if ( editor == null )
+-                {
+-                    editor = ScriptEditorForJavaScript.getEditor();
+-                    editor.edit( 
+-                        ScriptContext.createContext(m_xModel,
+-                            m_xContext, m_xMultiComponentFactory), metaData );
+-                    editor = ScriptEditorForJavaScript.getEditor( sourceUrl );
+-                } 
+-                if ( editor != null )
+-                {
+-                    System.out.println("** Have raised IDE for JavaScript, calling indicateErrorLine for line " + lineNum );
+-                    editor.indicateErrorLine( lineNum );
+-                }
+-            }
+-            catch( Exception ignore )
+-            {
+-            }
+-        } 
+-}
+-        
+--- scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java	2005-10-15 13:15:51.843570824 +0200
++++ /dev/null	2005-03-29 00:33:24.000000000 +0200
+@@ -1,385 +0,0 @@
+-/*************************************************************************
+- *
+- *  OpenOffice.org - a multi-platform office productivity suite
+- *
+- *  $RCSfile: ScriptEditorForJavaScript.java,v $
+- *
+- *  $Revision: 1.7 $
+- *
+- *  last change: $Author: rt $ $Date: 2005/09/09 02:04:45 $
+- *
+- *  The Contents of this file are made available subject to
+- *  the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- *    GNU Lesser General Public License Version 2.1
+- *    =============================================
+- *    Copyright 2005 by Sun Microsystems, Inc.
+- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- *    This library is free software; you can redistribute it and/or
+- *    modify it under the terms of the GNU Lesser General Public
+- *    License version 2.1, as published by the Free Software Foundation.
+- *
+- *    This library is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- *    Lesser General Public License for more details.
+- *
+- *    You should have received a copy of the GNU Lesser General Public
+- *    License along with this library; if not, write to the Free Software
+- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- *    MA  02111-1307  USA
+- *
+- ************************************************************************/
+-
+-package com.sun.star.script.framework.provider.javascript;
+-
+-import org.mozilla.javascript.Context;
+-import org.mozilla.javascript.Scriptable;
+-import org.mozilla.javascript.ImporterTopLevel;
+-import org.mozilla.javascript.tools.debugger.Main;
+-import org.mozilla.javascript.tools.debugger.ScopeProvider;
+-
+-import com.sun.star.script.provider.XScriptContext;
+-import com.sun.star.script.framework.container.ScriptMetaData;
+-import com.sun.star.script.framework.provider.ScriptEditor;
+-import com.sun.star.script.framework.log.LogUtils;
+-
+-import java.io.InputStream;
+-import java.io.IOException;
+-import java.net.URL;
+-
+-import java.util.Map;
+-import java.util.HashMap;
+-
+-import javax.swing.JFrame;
+-import javax.swing.SwingUtilities;
+-import java.awt.event.WindowAdapter;
+-import java.awt.event.WindowEvent;
+-
+-public class ScriptEditorForJavaScript implements ScriptEditor
+-{
+-    // global ScriptEditorForJavaScript instance
+-    private static ScriptEditorForJavaScript theScriptEditorForJavaScript;
+-
+-    // template for JavaScript scripts
+-    private static String JSTEMPLATE;
+-
+-    static private Main rhinoWindow;
+-    private URL scriptURL;
+-    // global list of ScriptEditors, key is URL of file being edited
+-    private static Map BEING_EDITED = new HashMap();
+-
+-    static {
+-        try {
+-            URL url =
+-                ScriptEditorForJavaScript.class.getResource("template.js");
+-
+-            InputStream in = url.openStream();
+-            StringBuffer buf = new StringBuffer();
+-            byte[] b = new byte[1024];
+-            int len = 0;
+-
+-            while ((len = in.read(b)) != -1) {
+-                buf.append(new String(b, 0, len));
+-            }
+-
+-            in.close();
+-
+-            JSTEMPLATE = buf.toString();
+-        }
+-        catch (IOException ioe) {
+-            JSTEMPLATE = "// JavaScript script";
+-        }
+-        catch (Exception e) {
+-            JSTEMPLATE = "// JavaScript script";
+-        }
+-    }
+-
+-    /**
+-     *  Returns the global ScriptEditorForJavaScript instance.
+-     */
+-    public static ScriptEditorForJavaScript getEditor()
+-    {
+-        if (theScriptEditorForJavaScript == null)
+-        {
+-            synchronized(ScriptEditorForJavaScript.class)
+-            {
+-                if (theScriptEditorForJavaScript == null)
+-                {
+-                    theScriptEditorForJavaScript =
+-                        new ScriptEditorForJavaScript();
+-                }
+-            }
+-        }
+-        return theScriptEditorForJavaScript;
+-    }
+-
+-    /**
+-     *  Get the ScriptEditorForJavaScript instance for this URL
+-     * 
+-     * @param  url         The URL of the script source file
+-     *
+-     * @return             The ScriptEditorForJavaScript associated with
+-     *                     the given URL if one exists, otherwise null.
+-     */
+-    public static ScriptEditorForJavaScript getEditor(URL url)
+-    {
+-        return (ScriptEditorForJavaScript)BEING_EDITED.get(url);
+-    }
+-
+-    /**
+-     *  Returns whether or not the script source being edited in this
+-     *  ScriptEditorForJavaScript has been modified
+-     */
+-    public boolean isModified()
+-    {
+-        return rhinoWindow.isModified( scriptURL );
+-    }
+-
+-    /**
+-     *  Returns the text being displayed in this ScriptEditorForJavaScript
+-     *
+-     *  @return            The text displayed in this ScriptEditorForJavaScript
+-     */
+-    public String getText()
+-    {
+-        return rhinoWindow.getText( scriptURL );
+-    }
+-
+-    /**
+-     *  Returns the Rhino Debugger url of this ScriptEditorForJavaScript
+-     *
+-     *  @return            The url of this ScriptEditorForJavaScript
+-     */
+-    public String getURL()
+-    {
+-        return scriptURL.toString(); 
+-    }
+-
+-    /**
+-     *  Returns the template text for JavaScript scripts
+-     *
+-     *  @return            The template text for JavaScript scripts
+-     */
+-    public String getTemplate()
+-    {
+-        return JSTEMPLATE;
+-    }
+-
+-    /**
+-     *  Returns the default extension for JavaScript scripts
+-     *
+-     *  @return            The default extension for JavaScript scripts
+-     */
+-    public String getExtension()
+-    {
+-        return "js";
+-    }
+-
+-    /**
+-     *  Opens an editor window for the specified ScriptMetaData.
+-     *  If an editor window is already open for that data it will be
+-     *  moved to the front.
+-     *
+-     * @param  metadata    The metadata describing the script
+-     * @param  context     The context in which to execute the script
+-     *
+-     */
+-    public void edit(final XScriptContext context, ScriptMetaData entry)
+-    {
+-        try {
+-            String sUrl = entry.getParcelLocation();
+-            if ( !sUrl.endsWith( "/" ) )
+-            {
+-                sUrl += "/";
+-            }
+-            sUrl +=  entry.getLanguageName();
+-            URL url = entry.getSourceURL();
+-
+-            // check if there is already an editing session for this script
+-            //if (BEING_EDITED.containsKey(url))
+-            if ( rhinoWindow != null  )
+-            {
+-                ScriptEditorForJavaScript editor =
+-                    (ScriptEditorForJavaScript) BEING_EDITED.get(url);
+-                if ( editor == null )
+-                {
+-                    editor = new ScriptEditorForJavaScript( context, url );
+-                    editor.edit( context, entry );
+-                }
+-                else
+-                {
+-                    rhinoWindow.showScriptWindow( url );
+-                }
+-            }
+-            else
+-            {
+-                ScriptEditorForJavaScript editor =
+-                    new ScriptEditorForJavaScript( context, url );
+-                
+-            }
+-            rhinoWindow.toFront();
+-        }
+-        catch ( IOException e )
+-        {
+-            LogUtils.DEBUG("Caught exception: " + e);
+-            LogUtils.DEBUG(LogUtils.getTrace(e));
+-        }
+-    }
+-
+-    // Ensures that new instances of this class can only be created using
+-    // the factory methods
+-    private ScriptEditorForJavaScript()
+-    {
+-    }
+-
+-    private ScriptEditorForJavaScript(XScriptContext context, URL url)
+-    {
+-        initUI();
+-        Scriptable scope = getScope( context );
+-        this.rhinoWindow.openFile(url, scope, new closeHandler( url ) );
+-
+-
+-        this.scriptURL = url;
+-        synchronized( ScriptEditorForJavaScript.class )
+-        {
+-            BEING_EDITED.put(url, this);
+-        }
+-
+-    }
+-
+-    /**
+-     *  Executes the script edited by the editor
+-     *
+-     */
+-
+-    public Object execute() throws Exception
+-    {
+-        rhinoWindow.toFront();
+-        
+-        return this.rhinoWindow.runScriptWindow( scriptURL );
+-    }
+-
+-    /**
+-     *  Indicates the line where error occured 
+-     *
+-     */
+-    public void indicateErrorLine( int lineNum )
+-    {
+-        this.rhinoWindow.toFront();
+-        this.rhinoWindow.highlighLineInScriptWindow( scriptURL, lineNum ); 
+-    }
+-    // This code is based on the main method of the Rhino Debugger Main class
+-    // We pass in the XScriptContext in the global scope for script execution
+-    private void initUI() {
+-        try {
+-            synchronized ( ScriptEditorForJavaScript.class )
+-            { 
+-                if ( this.rhinoWindow != null )
+-                {
+-                    return;
+-                }
+-                
+-                final Main sdb = new Main("Rhino JavaScript Debugger");
+-                swingInvoke(new Runnable() {
+-                    public void run() {
+-                        sdb.pack();
+-                        sdb.setSize(640, 640);
+-                        sdb.setVisible(true);
+-                    }
+-                    });
+-                sdb.setExitAction(new Runnable() {
+-                    public void run() {
+-                        sdb.clearAllBreakpoints();
+-                        sdb.dispose();
+-                        shutdown();
+-                    }
+-                });
+-                Context.addContextListener(sdb);
+-                sdb.setScopeProvider(new ScopeProvider() {
+-                    public Scriptable getScope() {
+-                        return org.mozilla.javascript.tools.shell.Main.getScope();
+-                    }
+-                });
+-                sdb.addWindowListener( new WindowAdapter() {
+-                    public void windowClosing(WindowEvent e) {
+-                        shutdown();
+-                    }
+-                });
+-                this.rhinoWindow = sdb;
+-            }
+-        } catch (Exception exc) {
+-            LogUtils.DEBUG( LogUtils.getTrace( exc ) );
+-        }
+-    }
+-
+-    private static void swingInvoke(Runnable f) {
+-        if (SwingUtilities.isEventDispatchThread()) {
+-            f.run();
+-            return;
+-        }
+-        try {
+-            SwingUtilities.invokeAndWait(f);
+-        } catch (Exception exc) {
+-            LogUtils.DEBUG( LogUtils.getTrace( exc ) );
+-        }
+-    }
+-
+-    private void shutdown()
+-    {
+-        // dereference Rhino Debugger window
+-        this.rhinoWindow = null;
+-        this.scriptURL = null;
+-        // remove all scripts from BEING_EDITED
+-        synchronized( BEING_EDITED )
+-        {
+-            java.util.Iterator iter = BEING_EDITED.keySet().iterator();
+-            java.util.Vector keysToRemove = new java.util.Vector();
+-            while ( iter.hasNext() )
+-            {
+-              
+-                URL key = (URL)iter.next();
+-                keysToRemove.add( key );
+-            }
+-            for ( int i=0; i<keysToRemove.size(); i++ )
+-            {
+-                BEING_EDITED.remove( keysToRemove.elementAt( i ) );
+-            }
+-            keysToRemove = null;
+-        }
+-        
+-    }
+-    private Scriptable getScope(XScriptContext xsctxt ) 
+-    {
+-        Context ctxt = Context.enter();
+-        ImporterTopLevel scope = new ImporterTopLevel(ctxt);
+-
+-        Scriptable jsCtxt = Context.toObject(xsctxt, scope);
+-        scope.put("XSCRIPTCONTEXT", scope, jsCtxt);
+-
+-        Scriptable jsArgs = Context.toObject(
+-           new Object[0], scope);
+-        scope.put("ARGUMENTS", scope, jsArgs);
+-
+-        Context.exit();
+-        return scope;
+-    }
+-
+-    class closeHandler implements Runnable 
+-    {
+-        URL url;
+-        closeHandler( URL url )
+-        {
+-            this.url = url;
+-        }
+-        public void run()
+-        { 
+-            synchronized( BEING_EDITED )
+-            {
+-                Object o = BEING_EDITED.remove( this.url );
+-            }
+-        }
+-    }
+-}
+--- scripting/java/build.xml-old	2005-10-15 13:03:27.000000000 +0200
++++ scripting/java/build.xml	2005-10-15 13:04:25.000000000 +0200
+@@ -59,7 +59,6 @@
+     <pathelement location="${solar.jar}/java_uno.jar"/>
+     <pathelement location="${solar.jar}/ridl.jar"/>
+     <pathelement location="${solar.jar}/bsh.jar"/>
+-    <pathelement location="${solar.jar}/js.jar"/>
+     <pathelement location="${jardir}"/>
+   </path> 
+ 
+@@ -169,19 +168,6 @@
+         </fileset>
+     </jar>
+ 
+-    <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
+-         basedir="${jardir}">
+-        <manifest>
+-            <attribute name="Built-By" value="Sun Microsystems"/>
+-            <attribute name="RegistrationClassName"
+-                       value="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript"/>
+-        </manifest>
+-        <include name="**/provider/javascript/*.class"/>
+-        <fileset dir=".">
+-          <include name="**/provider/javascript/*.js"/>
+-        </fileset>
+-    </jar>
+-
+     <jar jarfile="${jardir}/ScriptFramework.jar"
+          basedir="${jardir}">
+         <manifest>
+@@ -254,7 +240,6 @@
+   <!-- ====================== Clean Generated Files ===================== -->
+   <target name="clean">
+     <delete file="${jardir}/ScriptProviderForJava.jar"/>
+-    <delete file="${jardir}/ScriptProviderForJavaScript.jar"/>
+     <delete file="${jardir}/ScriptProviderForBeanShell.jar"/>
+     <delete file="${jardir}/ScriptFramework.jar"/>
+     <delete file="${jardir}/office.jar"/>
+--- scp2/source/ooo/file_ooo.scp-old	2005-10-16 00:54:49.944255848 +0200
++++ scp2/source/ooo/file_ooo.scp	2005-10-16 00:56:44.868784664 +0200
+@@ -626,10 +626,6 @@
+ #endif
+ 
+ #ifdef SOLAR_JAVA
+-STD_JAR_FILE( gid_File_Jar_Js, js )
+-#endif
+-
+-#ifdef SOLAR_JAVA
+ 
+ File gid_File_Jar_Juh
+     TXT_FILE_BODY;
+@@ -742,7 +738,6 @@
+ UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+ UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+ UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
+ #endif
+ 
+ #ifdef SOLAR_JAVA
+--- scripting/prj/build.lst-old	2005-10-16 13:16:18.799921760 +0200
++++ scripting/prj/build.lst	2005-10-16 13:16:30.053211000 +0200
+@@ -1,4 +1,4 @@
+-tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL
++tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 beanshell javaunohelper NULL
+ tc	scripting									usr1	-	all	tc_mkout NULL
+ tc	scripting\source\provider				nmake	-	all	tc_scriptingprovider NULL
+ tc	scripting\source\basprov				nmake	-	all	tc_scriptingbasprov NULL
diff --git a/patches/src680/ld-library-path.diff b/patches/src680/ld-library-path.diff
index 57de456a8..7f7146841 100644
--- a/patches/src680/ld-library-path.diff
+++ b/patches/src680/ld-library-path.diff
@@ -63,6 +63,80 @@
      export LD_LIBRARY_PATH
      ;;
  esac
+--- desktop/scripts/soffice.sh	2005-09-08 19:02:48.000000000 +0200
++++ desktop/scripts/soffice.sh	2005-10-20 12:59:08.000000000 +0200
+@@ -81,9 +81,9 @@
+ 
+ # set search path for shared libraries
+ sd_platform=`uname -s`
+-moz_lib=
++add_moz_lib=
+ for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
+-	test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break;
++	test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
+ done
+ case $sd_platform in
+   AIX)
+@@ -91,9 +91,9 @@
+     if [ $LIBPATH ]; then
+       SYSTEM_LIBPATH=$LIBPATH
+       export SYSTEM_LIBPATH
+-      LIBPATH="$sd_prog:$moz_lib":$LIBPATH
++      LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
+     else
+-      LIBPATH="$sd_prog:$moz_lib"
++      LIBPATH="$sd_prog$add_moz_lib"
+     fi
+     export LIBPATH
+     ;;
+@@ -103,9 +103,9 @@
+     if [ $DYLD_LIBRARY_PATH ]; then 
+       SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+       export SYSTEM_DYLD_LIBRARY_PATH
+-      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH
++      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
+     else
+-      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib"
++      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
+     fi
+     export DYLD_LIBRARY_PATH
+     ;;
+@@ -115,9 +115,9 @@
+     if [ $SHLIB_PATH ]; then
+       SYSTEM_SHLIB_PATH=$SHLIB_PATH
+       export SYSTEM_SHLIB_PATH
+-      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH
++      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
+     else
+-      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib
++      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
+     fi
+     export SHLIB_PATH
+     ;;
+@@ -127,9 +127,9 @@
+     if [ $LD_LIBRARYN32_PATH ]; then
+        SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
+        export SYSTEM_LD_LIBRARYN32_PATH
+-       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH
++       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
+     else
+-       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib"
++       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
+     fi
+     export LD_LIBRARYN32_PATH
+     ;;
+@@ -139,9 +139,9 @@
+     if [ $LD_LIBRARY_PATH ]; then
+       SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+       export SYSTEM_LD_LIBRARY_PATH
+-      LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH
++      LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
+     else
+-      LD_LIBRARY_PATH="$sd_prog:$moz_lib"
++      LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
+     fi
+     export LD_LIBRARY_PATH
+     ;;
 --- desktop/scripts/unopkg.sh	2005-10-10 17:00:52.000000000 +0200
 +++ desktop/scripts/unopkg.sh	2005-10-10 17:03:39.000000000 +0200
 @@ -91,27 +91,57 @@ fi
diff --git a/patches/src680/mozilla-buildlibs-win32.diff b/patches/src680/mozilla-buildlibs-win32.diff
new file mode 100644
index 000000000..3dcc86780
--- /dev/null
+++ b/patches/src680/mozilla-buildlibs-win32.diff
@@ -0,0 +1,148 @@
+--- moz/makefile.mk.orig	2005-09-07 21:59:19.000000000 +0200
++++ moz/makefile.mk	2005-10-14 17:30:15.684000000 +0200
+@@ -79,8 +79,17 @@
+ PATCH_FILE_NAME=mozilla-source-$(MOZILLA_VERSION).patch 
+ 
+ # These files are needed for the W32 build when BUILD_MOZAB is set
++LIBIDL_VERSION*=0.6.8
++LIBIDL_DLLVERSION*=0.6
++LIBIDL_PATCH_NAME*=libIDL-$(LIBIDL_VERSION)-ooo.patch
++LIBIDL_SRCTAR_NAME*=libIDL-$(LIBIDL_VERSION).tar.gz
+ LIBIDL_VC71_ZIPFILE_NAME*=vc71-libIDL-0.6.8-bin.zip
++LIBGLIB_VERSION*=1.2.10
++LIBGLIB_DLLVERSION*=1.2
++LIBGLIB_PATCH_NAME*=glib-$(LIBGLIB_VERSION)-ooo.patch
++LIBGLIB_SRCTAR_NAME*=glib-$(LIBGLIB_VERSION).tar.gz
+ LIBGLIB_VC71_ZIPFILE_NAME*=vc71-glib-1.2.10-bin.zip
++MOZILLA_MAKE_VER=3.79.1
+ WINTOOLS_ZIPFILE_NAME*=wintools.zip
+ 
+ ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
+@@ -234,15 +243,99 @@
+ 	+cd $(MOZTOOLSUNPACK)$/buildtools$/windows && $(SET_MOZ_TOOLS_INSTALL_BAT) && cmd /c install.bat
+ 	+$(TOUCH) $(MISC)$/build$/wintools.install
+ 
+-$(MISC)$/build$/wintools.complete : \
+-  $(MISC)$/build$/wintools.install \
+-  $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) \
+-  $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME)
+-	unzip $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
+-	unzip $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
++$(MISC)$/build$/glib.build : \
++  $(PRJ)$/download$/$(LIBGLIB_SRCTAR_NAME)
++	[
++	tar --directory $(MOZTOOLSUNPACK) -xzf $(PRJ)$/download$/$(LIBGLIB_SRCTAR_NAME)
++	set ABSPRJ=`cygpath -a $(PRJ)`
++	cd $(MOZTOOLSUNPACK)$/glib-$(LIBGLIB_VERSION)
++	patch -p1 < $$ABSPRJ$/download$/$(LIBGLIB_PATCH_NAME)
++	nmake -f Makefile.msc
++	cd $$ABSPRJ
++	$(TOUCH) $(MISC)$/build$/glib.build
++	]
++
++$(MISC)$/build$/libIDL.build : \
++  $(MISC)$/build$/glib.build \
++  $(PRJ)$/download$/$(LIBIDL_SRCTAR_NAME)
++	[
++	tar --directory $(MOZTOOLSUNPACK) -xzf $(PRJ)$/download$/$(LIBIDL_SRCTAR_NAME)
++	set ABSPRJ=`cygpath -a $(PRJ)`
++	cd $(MOZTOOLSUNPACK)$/libIDL-$(LIBIDL_VERSION)
++	patch -p1 < $$ABSPRJ$/download$/$(LIBIDL_PATCH_NAME)
++	nmake -f Makefile.msc libIDL-$(LIBIDL_DLLVERSION).dll
++	cd $$ABSPRJ
++	$(TOUCH) $(MISC)$/build$/libIDL.build
++	]
++
++$(MISC)$/build$/make.build : $(MISC)$/build$/wintools.unpack
++	+cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER) && nmake -f NMakefile
++	$(TOUCH) $(MISC)$/build$/make.build
++
++$(MISC)$/build$/shmsdos.build : $(MISC)$/build$/wintools.unpack
++	+cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos && nmake -f shmsdos.mak && nmake -f nsinstall.mak
++	$(TOUCH) $(MISC)$/build$/shmsdos.build
++
++$(MISC)$/build$/uname.build : $(MISC)$/build$/wintools.unpack
++	+cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/uname && nmake -f uname.mak
++	$(TOUCH) $(MISC)$/build$/uname.build
++
++LIBVC71_BINFILESLIST+=	\
++	glib-$(LIBGLIB_VERSION)$/glib-$(LIBGLIB_DLLVERSION).dll	\
++	glib-$(LIBGLIB_VERSION)$/gmodule-$(LIBGLIB_DLLVERSION).dll	\
++	libIDL-$(LIBIDL_VERSION)$/libIDL-$(LIBIDL_DLLVERSION).dll
++
++LIBVC71_INCLUDEFILESLIST+=	\
++	glib-$(LIBGLIB_VERSION)$/glib.h	\
++	glib-$(LIBGLIB_VERSION)$/glibconfig.h
++
++LIBVC71_LIBFILESLIST+=	\
++	glib-$(LIBGLIB_VERSION)$/glib-$(LIBGLIB_DLLVERSION).lib	\
++	glib-$(LIBGLIB_VERSION)$/gmodule-$(LIBGLIB_DLLVERSION).lib	\
++	libIDL-$(LIBIDL_VERSION)$/libIDL-$(LIBIDL_DLLVERSION).lib
++
++$(MISC)$/build$/wintools.build : \
++  $(MISC)$/build$/glib.build \
++  $(MISC)$/build$/libIDL.build \
++  $(MISC)$/build$/make.build \
++  $(MISC)$/build$/shmsdos.build \
++  $(MISC)$/build$/uname.build
+ # chmod is also needed for W32-4nt build (when cygwin unzip is used)
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/bin
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/include
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/lib
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/bin
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/include
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/include$/libIDL
++	@+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/lib
++	+$(foreach,file,$(LIBVC71_BINFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++	  $(MOZTOOLSINST)$/vc71$/bin &&) \
++	  echo >& $(NULLDEV)
++	+$(foreach,file,$(LIBVC71_INCLUDEFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++	  $(MOZTOOLSINST)$/vc71$/include &&) \
++	  echo >& $(NULLDEV)
++	+$(COPY) $(MOZTOOLSUNPACK)$/libIDL-$(LIBIDL_VERSION)$/IDL.h $(MOZTOOLSINST)$/vc71$/include$/libIDL
++	+$(foreach,file,$(LIBVC71_LIBFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++	  $(MOZTOOLSINST)$/vc71$/lib &&) \
++	  echo >& $(NULLDEV)
++	+$(COPY) -p $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/WinRel/make.exe \
++	  $(MOZTOOLSINST)$/bin$/gmake.exe
++	+$(COPY) -p $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/acconfig.h \
++	  $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/config.h \
++	  $(MOZTOOLSINST)$/include
++	+$(COPY) -p \
++	  $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos$/Release$/shmsdos.exe \
++	  $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos$/Release$/nsinstall.exe \
++	  $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/uname$/Release$/uname.exe \
++	  $(MOZTOOLSINST)$/bin
+ 	-chmod -R +x $(MOZTOOLSINST)$/vc71$/bin
++	+$(TOUCH) $(MISC)$/build$/wintools.build
++
++$(MISC)$/build$/wintools.complete : \
++  $(MISC)$/build$/wintools.unpack \
++  $(MISC)$/build$/wintools.build
+ 	+$(TOUCH) $(MISC)$/build$/wintools.complete
++
+ .ENDIF # "$(GUI)"=="WNT"
+ 
+ zip:	\
+--- config_office/configure.in	2005-10-13 10:31:41.000000000 +0200
++++ config_office/configure.in	2005-10-14 18:35:17.449625000 +0200
+@@ -2877,13 +2913,14 @@
+    fi 
+    if test "$_os" = "WINNT"; then
+       AC_MSG_CHECKING([for glib and libIDL binaries])
+-      if test ! -e "../moz/download/vc71-glib-1.2.10-bin.zip" \
+-           -o ! -e "../moz/download/vc71-libIDL-0.6.8-bin.zip" \
++      if test ! -e "../moz/download/glib-1.2.10.tar.gz" \
++           -o ! -e "../moz/download/libIDL-0.6.8.tar.gz" \
+            -o ! -e "../moz/download/wintools.zip" ; then
+ AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
+-  vc71-glib-1.2.10-bin.zip
+-  vc71-libIDL-0.6.8-bin.zip
+-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/)
++  glib-1.2.10.tar.gz
++(from ftp://ftp.gtk.org/pub/gtk/v1.2/)
++  libIDL-0.6.8.tar.gz
++(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/source/)
+   wintools.zip
+ (from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)])
+       else
diff --git a/patches/src680/system-icu.diff b/patches/src680/system-icu.diff
index d80cd7cfa..55835f5eb 100644
--- a/patches/src680/system-icu.diff
+++ b/patches/src680/system-icu.diff
@@ -86,13 +86,28 @@ diff -ru config_office.orig/set_soenv.in config_office/set_soenv.in
  ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
  ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
  ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
+Index: inc/collator_unicode.hxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/inc/collator_unicode.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 collator_unicode.hxx
+--- i18npool/inc/collator_unicode.hxx	21 Jul 2005 14:26:51 -0000	1.7
++++ i18npool/inc/collator_unicode.hxx	13 Sep 2005 13:49:44 -0000
+@@ -110,6 +110,7 @@ protected:
+     const sal_uInt8 *rulesImage;
+ private:
+ 	RuleBasedCollator *collator;
++	RuleBasedCollator *ucacollator;
+ };
+ 
+ #define COLLATOR( algorithm ) \
 Index: prj/build.lst
 ===================================================================
 RCS file: /cvs/l10n/i18npool/prj/build.lst,v
 retrieving revision 1.17
 diff -u -p -u -r1.17 build.lst
 --- i18npool/prj/build.lst	24 Apr 2003 11:54:37 -0000	1.17
-+++ i18npool/prj/build.lst	11 Sep 2005 09:47:54 -0000
++++ i18npool/prj/build.lst	13 Sep 2005 13:49:44 -0000
 @@ -1,4 +1,4 @@
 -inp  i18npool    :   bridges sax stoc comphelper tools icu i18nutil regexp NULL
 +inp  i18npool    :   bridges sax stoc comphelper tools ICU:icu i18nutil regexp NULL
@@ -105,7 +120,7 @@ RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
 retrieving revision 1.18
 diff -u -p -u -r1.18 breakiterator_unicode.cxx
 --- i18npool/source/breakiterator/breakiterator_unicode.cxx	25 Feb 2005 10:08:13 -0000	1.18
-+++ i18npool/source/breakiterator/breakiterator_unicode.cxx	11 Sep 2005 09:47:54 -0000
++++ i18npool/source/breakiterator/breakiterator_unicode.cxx	13 Sep 2005 13:49:44 -0000
 @@ -68,7 +68,9 @@ U_CDECL_BEGIN
  extern const char OpenOffice_icu_dat[];
  U_CDECL_END
@@ -132,7 +147,7 @@ RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
 retrieving revision 1.7
 diff -u -p -u -r1.7 makefile.mk
 --- i18npool/source/breakiterator/makefile.mk	23 Mar 2005 10:51:00 -0000	1.7
-+++ i18npool/source/breakiterator/makefile.mk	11 Sep 2005 09:47:54 -0000
++++ i18npool/source/breakiterator/makefile.mk	13 Sep 2005 13:49:44 -0000
 @@ -79,6 +79,8 @@ MY_BRK_TXTFILES:=$(shell ls data/*.txt)
  # insert "OpenOffice" as icu package name in front of the  name of each rule file for searching on application provided data
  MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
@@ -154,11 +169,11 @@ diff -u -p -u -r1.7 makefile.mk
  $(MISC)$/%_brk.c : $(MISC)$/%.brk
 -    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
 +    +$(WRAPCMD) genccode -e OpenOffice_icu -n OpenOffice_icu -d $(MISC)$ $(MISC)$/$*.brk
---- i18npool/source/collator/makefile.mk	2005-09-07 19:07:53.000000000 +0200
-+++ i18npool/source/collator/makefile.mk	2005-09-15 17:51:21.610808529 +0200
+--- i18npool/source/collator/makefile.mk       2005-09-07 19:07:53.000000000 +0200
++++ i18npool/source/collator/makefile.mk       2005-09-15 17:51:21.610808529 +0200
 @@ -78,6 +78,10 @@ APP1STDLIBS = $(SALLIB) \
- 		$(ICUINLIB) \
- 		$(ICUUCLIB)
+               $(ICUINLIB) \
+               $(ICUUCLIB)
  
 +.IF "$(SYSTEM_ICU)" == "YES"
 +CFLAGS += -DSYSTEM_ICU
@@ -166,22 +181,41 @@ diff -u -p -u -r1.7 makefile.mk
 +
  # --- Targets ------------------------------------------------------
  
- .INCLUDE :	target.mk
+ .INCLUDE :    target.mk
 Index: source/collator/collator_unicode.cxx
 ===================================================================
 RCS file: /cvs/l10n/i18npool/source/collator/collator_unicode.cxx,v
 retrieving revision 1.7
 diff -u -p -u -r1.7 collator_unicode.cxx
 --- i18npool/source/collator/collator_unicode.cxx	30 Jul 2004 14:39:21 -0000	1.7
-+++ i18npool/source/collator/collator_unicode.cxx	11 Sep 2005 09:47:54 -0000
-@@ -103,7 +103,11 @@ Collator_Unicode::loadCollatorAlgorithm(
++++ i18npool/source/collator/collator_unicode.cxx	13 Sep 2005 13:49:44 -0000
+@@ -74,12 +76,14 @@ Collator_Unicode::Collator_Unicode()
+ {
+ 	implementationName = "com.sun.star.i18n.Collator_Unicode";
+ 	collator = NULL;
++	ucacollator = NULL;
+     rulesImage = NULL;
+ }
+ 
+ Collator_Unicode::~Collator_Unicode()
+ {
+ 	if (collator) delete collator;
++	if (ucacollator) delete ucacollator;
+ }
+ 
+ sal_Int32 SAL_CALL
+@@ -103,7 +107,14 @@ Collator_Unicode::loadCollatorAlgorithm(
          // load ICU collator
          UErrorCode status = U_ZERO_ERROR;
          if (rulesImage) {
+-            collator = new RuleBasedCollator(rulesImage, status);
++            ucacollator = (RuleBasedCollator*) icu::Collator::createInstance("", status);
++         if (! U_SUCCESS(status))
++            	throw RuntimeException();
 +#ifdef SYSTEM_ICU
-+            collator = new RuleBasedCollator(rulesImage, -1, NULL, status);
++            collator = new RuleBasedCollator(rulesImage, -1, ucacollator, status);
 +#else
-             collator = new RuleBasedCollator(rulesImage, status);
++            collator = new RuleBasedCollator(rulesImage, status);
 +#endif
          } else {
             // load ICU collator
@@ -355,11 +389,11 @@ diff -ru scp2.orig/source/ooo/shortcut_ooo.scp scp2/source/ooo/shortcut_ooo.scp
  
  #ifdef UNX
  
---- vcl/prj/build.lst-old	2005-09-13 11:19:29.763057616 +0200
-+++ vcl/prj/build.lst	2005-09-13 11:19:42.736085416 +0200
+--- vcl/prj/build.lst	2005-09-13 08:51:51.000000000 +0100
++++ vcl/prj/build.lst	2005-09-09 08:37:54.000000000 +0100
 @@ -1,4 +1,4 @@
 -vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
-+v	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
++vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools rvpapi ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
  vc	vcl										usr1	-	all	vc_mkout NULL
  vc	vcl\source\unotypes						nmake	-	all	vc_unot NULL
  vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_unot NULL
diff --git a/patches/src680/win32-msvs-2003-configure.diff b/patches/src680/win32-msvs-2003-configure.diff
index ac2245d93..65ddc6a82 100644
--- a/patches/src680/win32-msvs-2003-configure.diff
+++ b/patches/src680/win32-msvs-2003-configure.diff
@@ -1,9 +1,10 @@
---- config_office/configure.in	2005-01-20 14:50:01.328125000 +0530
-+++ config_office/configure.in	2005-01-20 14:55:24.046875000 +0530
-@@ -929,6 +929,16 @@ dnl  Check which Microsoft C/C++ or MinG
+--- config_office/configure.in.orig	2005-10-13 10:31:41.000000000 +0200
++++ config_office/configure.in	2005-10-13 13:05:12.000000000 +0200
+@@ -1174,12 +1174,20 @@
  dnl ===================================================================
  if test "$_os" = "WINNT"; then
  	if test "$WITH_MINGWIN" != "yes"; then
+-		AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
 +		AC_MSG_CHECKING([for friendly registry keys])
 +		# VS.Net 2003, VS.Net 2002, VC6
 +		if test -z "$with_cl_home"; then
@@ -14,10 +15,25 @@
 +		fi
 +		AC_MSG_RESULT([done])
 +
- 		AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
  		dnl ===========================================================
- 		dnl  Check for mspdb??.dll
-@@ -1008,7 +1018,7 @@ dnl      The following find microsoft, m
+ 		dnl  Check for mspdb71.dll
+ 		dnl ===========================================================
+ 		dnl  .NET 2003 Compiler
+-		AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
+ 		if test -n "$MSPDB_PATH";then
+ 			MSPDB_PATH=`dirname "$MSPDB_PATH"`
+ 		fi
+@@ -1201,6 +1209,9 @@
+ 		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+ 		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+ 		PATH="$MSPDB_PATH:$PATH"
++		AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
++
++		AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+    		if test -x "$with_cl_home/bin/cl.exe"; then
+    			CC="$with_cl_home/bin/cl.exe"
+    		else
+@@ -1226,7 +1237,7 @@
  							}
  							}"`
  			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
@@ -25,8 +41,38 @@
 +			if test "$CCNUMVER" -ge "001300102240"; then
  				COMEX=10
  			else
- 				if test "$CCNUMVER" -ge "001300000000"; then
-@@ -1270,6 +1286,11 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ 				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003 compiler.])
+@@ -1251,7 +1262,6 @@
+ dnl ===================================================================
+ if test "$COMEX" = "8" -o "$COMEX" = "10"; then
+ 	dnl Check midl.exe
+-	AC_PATH_PROG(MIDL_PATH, midl.exe)
+ 	if test -n "$MIDL_PATH";then
+ 		MIDL_PATH=`dirname "$MIDL_PATH"`
+ 	fi
+@@ -1261,27 +1271,39 @@
+ 	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
+ 		MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
+ 	fi
++	if test -z "$MIDL_PATH" ; then
++      vstest=`./oowintool --msvs-productdir`;
++      if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
++		  MIDL_PATH="$vstest/Common7/Tools/Bin"
++      fi
++	fi
+ 	if test ! -x "$MIDL_PATH/midl.exe"; then
+ 		AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ 	fi
+ 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
+ 	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
+ 	MIDL_PATH=`cygpath -u "$MIDL_PATH"`
++	AC_PATH_PROG(MIDL_PATH, midl.exe)
+ 
+ 	dnl Check csc.exe
+-	AC_PATH_PROG(CSC_PATH, csc.exe)
+ 	if test -n "$CSC_PATH";then
+ 		CSC_PATH=`dirname "$CSC_PATH"`
+ 	fi
  	if test -x "$with_csc_path/csc.exe"; then
  		CSC_PATH="$with_csc_path"
  	fi
@@ -38,7 +84,38 @@
  	if test ! -x "$CSC_PATH/csc.exe"; then
  		AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
  	fi
-@@ -1803,6 +1824,12 @@ if test "$_os" = "Linux" && echo $build_
+ 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
+ 	CSC_PATH=`cygpath -d "$CSC_PATH"`
+ 	CSC_PATH=`cygpath -u "$CSC_PATH"`
++	AC_PATH_PROG(CSC_PATH, csc.exe)
+ 
+     dnl Check nmake.exe for MS VC Toolkit
+     if test -n "$ENABLE_VCTK"; then
+@@ -1304,15 +1326,23 @@
+     dnl This now has two meanings, for .NET2003 it has to point to the
+     dnl directory with lib/mscoree.lib and for VCTK to lib/msvcrt.lib.
+     if test -z "$ENABLE_VCTK"; then
++       AC_MSG_CHECKING(.NET Framework)
+ 	    if test -f "$with_frame_home/lib/mscoree.lib"; then
+ 		    FRAME_HOME="$with_frame_home"
+ 	    fi
+ 	    if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
+ 		    FRAME_HOME="$with_cl_home/../SDK/v1.1"
+ 	    fi
++	    if test -z "$FRAME_HOME" ; then
++          frametest=`./oowintool --dotnetsdk-dir`
++          if test -x "$frametest/lib/mscoree.lib"; then
++             FRAME_HOME="$frametest"
++          fi
++	    fi
+ 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
+ 		AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
+ 	    fi
++	    AC_MSG_RESULT(found)
+     else
+         if test ! -f "$COMPATH/../lib/mscoree.lib"; then
+         AC_MSG_ERROR([mscoree.lib not found. Unexpected, ask dev@tools.openoffice.org for help.])
+@@ -1809,6 +1839,12 @@
  fi
  AC_SUBST(LANG)
  
@@ -51,16 +128,35 @@
  
  dnl ===================================================================
  dnl Checks for java
-@@ -2206,7 +2216,7 @@ if test \( "$_os" = "WINNT" \) ; then
+@@ -3300,7 +3336,7 @@
  	AC_MSG_CHECKING([for PSDK files])
-   	if test -z "$with_psdk_home"; then
+ 	if test -z "$with_psdk_home"; then
  		# This first line will detect a February 2003 Microsoft Platform SDK
 -		PSDK_HOME=`cat "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir" 2> /dev/null`
 +		PSDK_HOME=`./oowintool --psdk-home`
          # But there might be also an April 2005 PSDK, unfortunately MS changed
          # the registry entry. (we prefer the old version!?)
          if test -z "$PSDK_HOME"; then
-@@ -2454,6 +2464,13 @@ may have to search Microsoft's website.)
+@@ -3408,6 +3444,10 @@
+     if test -e "$with_nsis_path/nsis.exe"; then
+         NSIS_PATH="$with_nsis_path"
+     fi
++    nsistest=`./oowintool --nsis-dir`;
++    if test -x "$nsistest/nsis.exe"; then
++        NSIS_PATH="$nsistest"
++    fi
+     if test -z "$NSIS_PATH"; then
+         AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
+         echo "NSIS not found, no self contained installer will be build." >> warn
+@@ -3535,6 +3575,7 @@
+     if test -z "$ML_EXE"; then
+       if test -x "$with_cl_home/bin/ml.exe"; then
+         with_asm_home=$with_cl_home/bin
++        AC_MSG_RESULT([found ($with_asm_home)])
+       else
+         AC_MSG_ERROR([Configure did not find ml.exe assembler.])
+       fi
+@@ -3624,6 +3665,13 @@
  fi
  
  dnl ===================================================================
@@ -74,3 +170,17 @@
  dnl Windows builds with .NET need msvcp70.dll/msvcr70.dll in external/msvcp70/
  dnl ===================================================================
  if test "$_os" = "WINNT" -a "$COMEX" = "8"; then
+@@ -3676,6 +3724,13 @@
+ fi
+ 
+ dnl ===================================================================
++dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
++dnl ===================================================================
++if test "$_os" = "WINNT"; then
++       ./oowintool --msvc-copy-instmsi ../external/msi
++fi
++
++dnl ===================================================================
+ dnl Windows builds with .NET 2003 need instmsia.exe and instmsiw.exe in external/msi
+ dnl ===================================================================
+ if test "$_os" = "WINNT" -a "$COMEX" = "10"; then
diff --git a/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff b/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
index 27262a439..683b3a239 100644
--- a/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
+++ b/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
@@ -1,6 +1,6 @@
 --- /dev/null	2005-10-10 09:55:51.712408000 +0100
 +++ sc/source/ui/vba/vbaapplication.cxx	2005-10-12 17:18:38.000000000 +0100
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,121 @@
 +
 +
 +#include<com/sun/star/sheet/XSpreadsheetView.hpp>
@@ -60,6 +60,8 @@
 +	uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
 +                                                                                                                             
 +	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
++	if ( !pViewShell )
++		throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
 +	sal_Int32 nCursorX, nCursorY;
 +	nCursorX = sal_Int32(pViewShell->GetViewData()->GetCurX()), nCursorY = sal_Int32(pViewShell->GetViewData()->GetCurY());
 +	return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, 
diff --git a/po/ts.po b/po/ts.po
new file mode 100644
index 000000000..1447ace32
--- /dev/null
+++ b/po/ts.po
@@ -0,0 +1,65 @@
+# Tsonga translation of OpenOffice.org Build.
+# Copyright (C) 2005 Zuza Software Foundation (Translate.org.za)
+# This file is distributed under the same license as the ooo-build package.
+# Translate.org.za <info@translate.org.za>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ooo-build\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-20 22:15+0200\n"
+"PO-Revision-Date: 2005-10-24 16:23+0200\n"
+"Last-Translator: Translate.org.za <info@translate.org.za>\n"
+"Language-Team: Tsonga <translate-discuss-ts@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: desktop/drawing.desktop.in.h:1
+msgid "Drawing"
+msgstr "Vudirowi"
+
+#: desktop/drawing.desktop.in.h:2
+msgid "OpenOffice.org drawing package"
+msgstr "Xikatsa xa vudirowi xa OpenOffice.org"
+
+#: desktop/presentation.desktop.in.h:1
+msgid "OpenOffice.org presentation application"
+msgstr "Vutirhisi bya nkombiso wa OpenOffice.org"
+
+#: desktop/presentation.desktop.in.h:2
+msgid "Presentation"
+msgstr "Nkombiso"
+
+#: desktop/spreadsheet.desktop.in.h:1
+msgid "OpenOffice.org spreadsheet"
+msgstr "Xipredxiti xa OpenOffice.org"
+
+#: desktop/spreadsheet.desktop.in.h:2
+msgid "Spreadsheet"
+msgstr "Xipredxiti"
+
+#: desktop/textdoc.desktop.in.h:1
+msgid "OpenOffice.org word processor"
+msgstr "Xitirhisi xa marito xa OpenOffice.org"
+
+#: desktop/textdoc.desktop.in.h:2
+msgid "Word Processor"
+msgstr "Xitirhisi xa marito"
+
+#: desktop/database.desktop.in.h:1
+msgid "Database"
+msgstr "Vuhlayisela-rungula"
+
+#: desktop/database.desktop.in.h:2
+msgid "OpenOffice.org database"
+msgstr "Vuhlayisela-rungula bya OpenOffice.org"
+
+#: desktop/formula.desktop.in.h:1
+msgid "Formula"
+msgstr "Fomula"
+
+#: desktop/formula.desktop.in.h:2
+msgid "OpenOffice.org formula editor"
+msgstr "Xihleri xa fomula xa OpenOffice.org"
+
diff --git a/src/openintro_nld.bmp b/src/openintro_nld.bmp
index 11da60723..f76127d71 100644
--- a/src/openintro_nld.bmp
+++ b/src/openintro_nld.bmp
diff --git a/src/openintro_pld.bmp b/src/openintro_pld.bmp
index ed9977789..a29049860 100644
--- a/src/openintro_pld.bmp
+++ b/src/openintro_pld.bmp