[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-44-g4c5b85d
The following commit has been merged in the debian-experimental-3.5 branch:
commit 4c5b85d60bcfa4c70707152474ea3fe491d9af03
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 21 00:49:08 2011 +0200
update more patches
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 3abc916..48e2d24 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -2,12 +2,12 @@ diff --git a/configure.in b/configure.in
index 3257668..afd36de 100755
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -1663,8 +1663,13 @@ dnl whether to include symbols into final build.
+@@ -2352,8 +2352,13 @@
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols])
if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-- ENABLE_SYMBOLS="TRUE"
-- AC_MSG_RESULT([yes])
+- ENABLE_SYMBOLS="TRUE"
+- AC_MSG_RESULT([yes])
+ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
+ ENABLE_SYMBOLS="SMALL"
+ AC_MSG_RESULT([yes, small ones])
@@ -16,8 +16,8 @@ index 3257668..afd36de 100755
+ AC_MSG_RESULT([yes])
+ fi
else
- ENABLE_SYMBOLS=
- AC_MSG_RESULT([no])
+ ENABLE_SYMBOLS=
+ AC_MSG_RESULT([no])
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..9338110 100644
--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
@@ -48,17 +48,9 @@ index c73333f..9338110 100644
GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
--- libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05 12:38:23.398653265 +0200
+++ libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk 2011-07-05 14:10:50.598728992 +0200
-@@ -217,14 +217,19 @@
+@@ -314,9 +314,14 @@
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
- ifneq ($(gb_DEBUGLEVEL),0)
--gb_LinkTarget_CXXFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
--gb_LinkTarget_CFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
--endif
--
-+gb_LinkTarget_CXXFLAGS += -finline-limit=0 -fno-inline -fno-default-inline -ggdb2
-+gb_LinkTarget_CFLAGS += -finline-limit=0 -fno-inline -fno-default-inline -ggdb2
-+else
ifeq ($(gb_SYMBOL),$(true))
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_LinkTarget_CXXFLAGS += -g1
@@ -68,7 +60,6 @@ index c73333f..9338110 100644
gb_LinkTarget_CFLAGS += -ggdb2
endif
+endif
-+endif
gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index f1b1bd5..0a4a9e9 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -1,133 +1,103 @@
-diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
-index 4075123..7bc015b 100644
---- libreoffice-3.3.2/libreoffice-build/patches/dev300/debian-opt.diff
-+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/debian-opt.diff
-@@ -1,37 +1,103 @@
--Index: unxlngs.mk
--===================================================================
----- solenv/inc/unxlngs.mk (Revision 276754)
--+++ solenv/inc/unxlngs.mk (Arbeitskopie)
--@@ -33,7 +33,7 @@
-+diff --git a/configure.in b/configure.in
-+index c0b76f8..d10222f 100644
-+--- configure.in
-++++ configure.in
-+@@ -7936,6 +7936,13 @@ fi
-+ AC_MSG_RESULT([$BUILD_MAX_JOBS])
-+ AC_SUBST(BUILD_MAX_JOBS)
-
-- ASM=$(CC)
-- AFLAGS=-Wa,-K,PIC -c $(CDEFS)
---CDEFAULTOPT=-Os
--+CDEFAULTOPT=-O2
-- PICSWITCH:=-fPIC
-- .INCLUDE : unxlng.mk
-- CDEFS+=-DSPARC
--Index: unxlngi.mk
--===================================================================
----- solenv/inc/unxlngi.mk (Revision 276754)
--+++ solenv/inc/unxlngi.mk (Arbeitskopie)
--@@ -30,7 +30,7 @@
-++if [ -x /usr/bin/dpkg-buildflags ]; then
-++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
-++else
-++ CDEFAULTOPT=-O2
-++fi
-++AC_SUBST(CDEFAULTOPT)
-++
-+ dnl ===================================================================
-+ dnl Setting up the environment.
-+ dnl ===================================================================
-+diff --git a/set_soenv.in b/set_soenv.in
-+index ea9f10c..1b32f7f 100644
-+--- set_soenv.in
-++++ set_soenv.in
-+@@ -1748,6 +1748,7 @@ ToFile( "COMPATH", $COMPATH, "e" );
-+ ToFile( "CPU", $CPU, "e" );
-+ ToFile( "CPUNAME", $CPUNAME, "e" );
-+ ToFile( "CVER", $CVER, "e" );
-++ToFile( "CDEFAULTOPT", "@CDEFAULTOPT@", "e" );
-+ ToFile( "GUI", $GUI, "e" );
-+ ToFile( "GLIBC", $GLIBC, "e" );
-+ ToFile( "GUIBASE", $GUIBASE, "e" );
-+diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
-+index b54736c..4f7177d 100644
-+--- solenv/inc/unxgcc.mk
-++++ solenv/inc/unxgcc.mk
-+@@ -31,7 +31,7 @@ ASM*=
-+ AFLAGS*=
-+ SOLAR_JAVA*=
-+ # default optimization level for product code
-+-CDEFAULTOPT*=-O2
-++CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
-+ # architecture dependent flags for the C and C++ compiler that can be changed by
-+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ ARCH_FLAGS*=
-+diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
-+index d86aab1..a10adb6 100644
-+--- solenv/inc/unxlngi.mk
-++++ solenv/inc/unxlngi.mk
-+@@ -26,7 +26,6 @@
- #*************************************************************************
-
- # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
- -CDEFAULTOPT=-Os
--+CDEFAULTOPT=-O2
- .IF "$(GCCNUMVER)" >= "000400050000"
- ARCH_FLAGS*=-mtune=atom
- .ELSE
----- solenv/inc/unxlngppc.mk (Revision 277719)
--+++ solenv/inc/unxlngppc.mk (Arbeitskopie)
--@@ -31,7 +31,7 @@
-+diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
-+index da6ed55..284bfa8 100644
-+--- solenv/inc/unxlngm68k.mk
-++++ solenv/inc/unxlngm68k.mk
-+@@ -27,7 +27,6 @@
-+
-+ # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
-+
-+-CDEFAULTOPT=-Os
-+ PICSWITCH:=-fPIC
-+ .INCLUDE : unxlng.mk
-+ CDEFS+=-DM68K
-+diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
-+index 53c927d..c1b7164 100644
-+--- solenv/inc/unxlngmips.mk
-++++ solenv/inc/unxlngmips.mk
-+@@ -27,7 +27,6 @@
-
-- # mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk
-+ # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
-
---DEFAULTOPT=-Os
--+DEFAULTOPT=-O2
-+-CDEFAULTOPT=-Os
-+ .INCLUDE : unxlng.mk
-+ CDEFS+=-DMIPS
-+ DLLPOSTFIX=lm
-+diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
-+index 1bcbb66..acd84fb 100644
-+--- solenv/inc/unxlngr.mk
-++++ solenv/inc/unxlngr.mk
-+@@ -27,7 +27,6 @@
-+
-+ # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
-+
-+-CDEFAULTOPT=-Os
-+ .INCLUDE : unxlng.mk
-+ CDEFS+=-DARM32
-+ CFLAGS+=-fno-omit-frame-pointer
-+diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
-+index b4e6f5f..f33411a 100644
-+--- solenv/inc/unxlngs.mk
-++++ solenv/inc/unxlngs.mk
-+@@ -29,7 +29,6 @@
-+
-+ ASM=$(CC)
-+ AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-+-CDEFAULTOPT=-Os
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
-- CDEFS+=-DPOWERPC -DPPC
-+ CDEFS+=-DSPARC
+diff --git a/configure.in b/configure.in
+index c0b76f8..d10222f 100644
+--- libreoffice-3.5.0/configure.in
++++ libreoffice-3.5.0/configure.in
+@@ -7936,6 +7936,13 @@ fi
+ AC_MSG_RESULT([$BUILD_MAX_JOBS])
+ AC_SUBST(BUILD_MAX_JOBS)
+
++if [ -x /usr/bin/dpkg-buildflags ]; then
++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
++else
++ CDEFAULTOPT=-O2
++fi
++AC_SUBST(CDEFAULTOPT)
++
+ dnl ===================================================================
+ dnl Setting up the environment.
+ dnl ===================================================================
+diff --git a/set_soenv.in b/set_soenv.in
+index ea9f10c..1b32f7f 100644
+--- libreoffice-3.5.0/set_soenv.in
++++ libreoffice-3.5.0/set_soenv.in
+@@ -1562,6 +1562,7 @@
+ ToFile( "COMPATH", $COMPATH, "e" );
+ ToFile( "CPU", $CPU, "e" );
+ ToFile( "CPUNAME", $CPUNAME, "e" );
++ToFile( "CDEFAULTOPT", "@CDEFAULTOPT@", "e" );
+ ToFile( "GUI", $GUI, "e" );
+ ToFile( "GUIBASE", $GUIBASE, "e" );
+ ToFile( "GVER", $GVER, "e" );
+diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
+index b54736c..4f7177d 100644
+--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
++++ libreoffice-3.5.0/solenv/inc/unxgcc.mk
+@@ -31,7 +31,7 @@ ASM*=
+ AFLAGS*=
+ SOLAR_JAVA*=
+ # default optimization level for product code
+-CDEFAULTOPT*=-O2
++CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
+ # architecture dependent flags for the C and C++ compiler that can be changed by
+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ ARCH_FLAGS*=
+diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
+index d86aab1..a10adb6 100644
+--- libreoffice-3.5.0/solenv/inc/unxlngi.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngi.mk
+@@ -26,7 +26,6 @@
+ #*************************************************************************
+
+ # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
+-CDEFAULTOPT=-Os
+ .IF "$(GCCNUMVER)" >= "000400050000"
+ ARCH_FLAGS*=-mtune=atom
+ .ELSE
+diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
+index da6ed55..284bfa8 100644
+--- libreoffice-3.5.0/solenv/inc/unxlngm68k.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngm68k.mk
+@@ -27,7 +27,6 @@
+
+ # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
+
+-CDEFAULTOPT=-Os
+ PICSWITCH:=-fPIC
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DM68K
+diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
+index 53c927d..c1b7164 100644
+--- libreoffice-3.5.0/solenv/inc/unxlngmips.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngmips.mk
+@@ -27,7 +27,6 @@
+
+ # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
+
+-CDEFAULTOPT=-Os
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DMIPS
+ DLLPOSTFIX=lm
+diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
+index 1bcbb66..acd84fb 100644
+--- libreoffice-3.5.0/solenv/inc/unxlngr.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngr.mk
+@@ -27,7 +27,6 @@
+
+ # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
+
+-CDEFAULTOPT=-Os
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DARM32
+ CFLAGS+=-fno-omit-frame-pointer
+diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
+index b4e6f5f..f33411a 100644
+--- libreoffice-3.5.0/solenv/inc/unxlngs.mk
++++ libreoffice-3.5.0/solenv/inc/unxlngs.mk
+@@ -29,7 +29,6 @@
+
+ ASM=$(CC)
+ AFLAGS=-Wa,-K,PIC -c $(CDEFS)
+-CDEFAULTOPT=-Os
+ PICSWITCH:=-fPIC
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DSPARC
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index fc8bb66..763e384 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -1,857 +1,50 @@
---- libreoffice-3.5.0/scripting/prj/build.lst-old 2011-06-27 20:07:54.000000000 +0000
-+++ libreoffice-3.5.0/scripting/prj/build.lst 2011-06-27 20:06:28.000000000 +0000
-@@ -1,4 +1,4 @@
--tc scripting : filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
-+tc scripting : filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
- tc scripting usr1 - all tc1_mkout NULL
- tc scripting\inc nmake - all tc1_inc NULL
- tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL
-diff -urN scripting-old//java/build.xml scripting/java/build.xml
---- libreoffice-3.5.0/scripting-old//java/build.xml 2011-06-28 08:26:38.000000000 +0000
-+++ libreoffice-3.5.0/scripting/java/build.xml 2011-06-28 08:30:38.000000000 +0000
-@@ -53,7 +53,6 @@
- <pathelement location="${solar.jar}/java_uno.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${env.BSH_JAR}"/>
-- <pathelement location="${solar.jar}/js.jar"/>
- <pathelement location="${jardir}"/>
- </path>
+diff --git a/configure.in b/configure.in
+index 6037452..2251d85 100644
+--- libreoffice-3.5.0/configure.in
++++ libreoffice-3.5.0/configure.in
+@@ -7507,6 +7508,7 @@ AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript
+ if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_SCRIPTING_JAVASCRIPT=YES
++ BUILD_TYPE="$BUILD_TYPE RHINO"
+ else
+ AC_MSG_RESULT([no])
+ ENABLE_SCRIPTING_JAVASCRIPT=NO
+diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
+index b926b07..67f8a71 100644
+--- libreoffice-3.5.0/scripting/Module_scripting.mk
++++ libreoffice-3.5.0/scripting/Module_scripting.mk
+@@ -40,7 +40,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
+ Jar_ScriptFramework \
+ Jar_ScriptProviderForBeanShell \
+ Jar_ScriptProviderForJava \
+- Jar_ScriptProviderForJavaScript \
++ $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
++ Jar_ScriptProviderForJavaScript) \
+ Zip_ScriptsJava \
+ ) \
+ $(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\
+@@ -54,7 +55,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
+ Pyuno_mailmerge \
+ Zip_scriptbindinglib \
+ Zip_ScriptsBeanShell \
+- Zip_ScriptsJavaScript \
++ $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
++ Zip_ScriptsJavaScript) \
+ Zip_ScriptsPython \
+ ))
-@@ -184,21 +183,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"/>
-- <attribute name="Class-Path" value="ScriptFramework.jar js.jar"/>
-- <attribute name="UNO-Type-Path" value=""/>
-- </manifest>
-- <include name="**/provider/javascript/*.class"/>
-- <fileset dir=".">
-- <include name="**/provider/javascript/*.js"/>
-- </fileset>
-- </jar>
--
- <jar jarfile="${jardir}/ScriptFramework.jar"
- basedir="${jardir}">
- <manifest>
-@@ -272,7 +256,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"/>
-diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
---- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
-+++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
-@@ -1,351 +0,0 @@
--/*************************************************************************
-- *
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * Copyright 2000, 2010 Oracle and/or its affiliates.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org 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 version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org. If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
-- ************************************************************************/
--
--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.provider.SwingInvocation;
--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 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)
-- {
-- synchronized (BEING_EDITED) {
-- 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();
-- final URL url = entry.getSourceURL();
-- SwingInvocation.invoke(
-- new Runnable() {
-- public void run() {
-- synchronized (BEING_EDITED) {
-- ScriptEditorForJavaScript editor =
-- (ScriptEditorForJavaScript) BEING_EDITED.get(
-- url);
-- if (editor == null) {
-- editor = new ScriptEditorForJavaScript(
-- context, url);
-- BEING_EDITED.put(url, editor);
-- }
-- }
-- assert rhinoWindow != null;
-- rhinoWindow.showScriptWindow(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;
-- }
--
-- /**
-- * Executes the script edited by the editor
-- *
-- */
--
-- public Object execute() throws Exception
-- {
-- rhinoWindow.toFront();
--
-- return this.rhinoWindow.runScriptWindow( scriptURL );
-- }
--
-- /**
-- * Indicates the line where error occurred
-- *
-- */
-- 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");
-- 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 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 );
-- }
-- }
-- }
--}
-diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
---- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 2011-06-28 08:26:37.000000000 +0000
-+++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 1970-01-01 00:00:00.000000000 +0000
-@@ -1,392 +0,0 @@
--/*************************************************************************
--*
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * Copyright 2000, 2010 Oracle and/or its affiliates.
-- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * This file is part of OpenOffice.org.
-- *
-- * OpenOffice.org is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3
-- * only, as published by the Free Software Foundation.
-- *
-- * OpenOffice.org 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 version 3 for more details
-- * (a copy is included in the LICENSE file that accompanied this code).
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * version 3 along with OpenOffice.org. If not, see
-- * <http://www.openoffice.org/license.html>
-- * for a copy of the LGPLv3 License.
-- *
--************************************************************************/
--package com.sun.star.script.framework.provider.javascript;
--
--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.document.XScriptInvocationContext;
--import com.sun.star.reflection.InvocationTargetException;
--
--import java.net.URL;
--
--import com.sun.star.script.provider.XScript;
--
--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 org.mozilla.javascript.Context;
--import org.mozilla.javascript.ImporterTopLevel;
--import org.mozilla.javascript.Scriptable;
--import org.mozilla.javascript.JavaScriptException;
--
--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, m_xInvocContext );
-- 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;
-- private XScriptInvocationContext m_xInvocContext;
--
-- ScriptImpl( XComponentContext ctx, ScriptMetaData metaData, XModel xModel, XScriptInvocationContext xInvocContext ) throws com.sun.star.uno.RuntimeException
-- {
-- this.metaData = metaData;
-- this.m_xContext = ctx;
-- this.m_xModel = xModel;
-- this.m_xInvocContext = xInvocContext;
-- 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.MALFORMED_URL );
-- }
-- 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_xInvocContext, 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_xInvocContext,
-- 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 )
-- {
-- }
-- }
--}
--
-diff -urN scripting-old//java/com/sun/star/script/framework/provider/javascript/template.js scripting/java/com/sun/star/script/framework/provider/javascript/template.js
---- libreoffice-3.5.0/scripting-old//java/com/sun/star/script/framework/provider/javascript/template.js 2011-06-28 08:26:37.000000000 +0000
-+++ libreoffice-3.5.0/scripting/java/com/sun/star/script/framework/provider/javascript/template.js 1970-01-01 00:00:00.000000000 +0000
-@@ -1,37 +0,0 @@
--// Hello World in JavaScript
--// Import standard OpenOffice.org API classes. For more information on
--// these classes and the OpenOffice.org API, see the OpenOffice.org
--// Developers Guide at:
--// http://api.openoffice.org/
--
--importClass(Packages.com.sun.star.uno.UnoRuntime);
--importClass(Packages.com.sun.star.text.XTextDocument);
--importClass(Packages.com.sun.star.text.XText);
--importClass(Packages.com.sun.star.text.XTextRange);
--importClass(Packages.com.sun.star.frame.XModel);
--
--// Import XScriptContext class. An instance of this class is available
--// to all JavaScript scripts in the global variable "XSCRIPTCONTEXT". This
--// variable can be used to access the document for which this script
--// was invoked.
--//
--// Methods available are:
--//
--// XSCRIPTCONTEXT.getDocument() returns XModel
--// XSCRIPTCONTEXT.getInvocationContext() returns XScriptInvocationContext or NULL
--// XSCRIPTCONTEXT.getDesktop() returns XDesktop
--// XSCRIPTCONTEXT.getComponentContext() returns XComponentContext
--//
--// For more information on using this class see the scripting
--// developer guides at:
--//
--// http://api.openoffice.org/docs/DevelopersGuide/ScriptingFramework/ScriptingFramework.xhtml
--//
--
--oDoc = UnoRuntime.queryInterface(XModel,XSCRIPTCONTEXT.getInvocationContext());
--if ( !oDoc )
-- oDoc = XSCRIPTCONTEXT.getDocument();
--xTextDoc = UnoRuntime.queryInterface(XTextDocument,oDoc);
--xText = xTextDoc.getText();
--xTextRange = xText.getEnd();
--xTextRange.setString( "Hello World (in JavaScript)" );
-diff -urN scp2-old//source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp
---- libreoffice-3.5.0/scp2-old//source/ooo/file_ooo.scp 2011-06-28 08:32:41.000000000 +0000
-+++ libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp 2011-06-28 08:33:19.000000000 +0000
-@@ -1261,12 +1256,6 @@
- End
- #endif
-
--File gid_File_Scripts_Javascript
-- Dir = gid_Dir_Share_Scripts;
-- ARCHIVE_TXT_FILE_BODY;
-- Name = "ScriptsJavaScript.zip";
--End
--
- // new user interface configuration files
- File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
- TXT_FILE_BODY;
+diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
+index 2bd4c61..f874898 100644
+--- libreoffice-3.5.0/scripting/prj/build.lst
++++ libreoffice-3.5.0/scripting/prj/build.lst
+@@ -1,2 +1,2 @@
+-tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
++tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+ tc scripting\prj nmake - all tc1_prj NULL
+--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20 22:44:37.000000000 +0000
++++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20 22:44:49.000000000 +0000
+@@ -1,2 +1,2 @@
+-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
++tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+ tb tail_build\prj nmake - all tb_prj NULL
diff --git a/patches/series b/patches/series
index 38a6f4f..6a7330a 100644
--- a/patches/series
+++ b/patches/series
@@ -1,12 +1,11 @@
splash-progressbarcolor.diff
no-minimaltoc.diff
-#l-b#update-debian-opt.diff
+debian-opt.diff
odk-jni-include.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
-#debian-debug.diff
-#disable-rhino.diff
-#bsh-hardcode-path.diff
+debian-debug.diff
+rhino-build-optional.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
#make-gengal-work-again.diff
--
LibreOffice packaging repository
Reply to: