diff options
22 files changed, 0 insertions, 401 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 774a5f598046..10641958a9a1 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -148,7 +148,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \ $(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \ $(call fetch_Optional,LIBJPEG_TURBO,LIBJPEG_TURBO_TARBALL) \ - $(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \ $(call fetch_Optional,LCMS2,LCMS2_TARBALL) \ $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBASSUAN,LIBASSUAN_TARBALL) \ diff --git a/configure.ac b/configure.ac index 3d26c34ebe04..1d432bc77a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -13242,7 +13242,6 @@ AC_SUBST([WITH_EXTRA_EXTENSIONS]) libo_CHECK_EXTENSION([Numbertext],[NUMBERTEXT],[numbertext],[numbertext],[b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt]) if test "x$with_java" != "xno"; then libo_CHECK_EXTENSION([NLPSolver],[NLPSOLVER],[nlpsolver],[nlpsolver],[]) - libo_CHECK_EXTENSION([LanguageTool],[LANGUAGETOOL],[languagetool],[languagetool],[]) fi AC_MSG_CHECKING([whether to build opens___.ttf]) diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 7f225e3258ff..5c73e601b7db 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -6,7 +6,6 @@ --enable-eot --enable-epm --enable-evolution2 ---enable-ext-languagetool --with-system-mariadb --enable-ext-nlpsolver --enable-ext-numbertext diff --git a/download.lst b/download.lst index f10e943755b7..feb2dcf41e32 100644 --- a/download.lst +++ b/download.lst @@ -138,8 +138,6 @@ export LIBJPEG_TURBO_SHA256SUM := 09b96cb8cbff9ea556a9c2d173485fd19488844d55276e export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.2.tar.gz export LANGTAGREG_SHA256SUM := d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837 export LANGTAGREG_TARBALL := language-subtag-registry-2021-12-29.tar.bz2 -export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d -export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 export LCMS2_TARBALL := lcms2-2.12.tar.gz export LIBASSUAN_SHA256SUM := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 diff --git a/external/Module_external.mk b/external/Module_external.mk index 9f0215e5ca9e..4f97609adbae 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ICU,icu) \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,LIBJPEG_TURBO,libjpeg-turbo) \ - $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBASSUAN,libassuan) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ diff --git a/external/languagetool/ExtensionPackage_LanguageTool.mk b/external/languagetool/ExtensionPackage_LanguageTool.mk deleted file mode 100644 index 3b685d707449..000000000000 --- a/external/languagetool/ExtensionPackage_LanguageTool.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExtensionPackage_ExtensionPackage,LanguageTool,$(call gb_UnpackedTarball_get_dir,languagetool)/dist/LanguageTool.oxt)) - -$(eval $(call gb_ExtensionPackage_use_external_project,LanguageTool,languagetool)) - -# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk deleted file mode 100644 index ed70df41ad69..000000000000 --- a/external/languagetool/ExternalProject_languagetool.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,languagetool)) - -$(eval $(call gb_ExternalProject_register_targets,languagetool,\ - build \ -)) - -$(eval $(call gb_ExternalProject_use_jars,languagetool,\ - juh \ - jurt \ - ridl \ - unoil \ -)) - -$(call gb_ExternalProject_get_state_target,languagetool,build) : \ - $(call gb_Jar_get_target,libreoffice) - cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ - JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \ - $(ICECREAM_RUN) "$(ANT)" \ - $(if $(verbose),-v,-q) \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - -Dsource=$(JAVA_SOURCE_VER) \ - -Dtarget=$(JAVA_TARGET_VER) \ - $(if $(debug),-Dbuild.debug="on") \ - -Dext.ooo.juh.lib="$(call gb_Jar_get_target,juh)" \ - -Dext.ooo.jurt.lib="$(call gb_Jar_get_target,jurt)" \ - -Dext.ooo.ridl.lib="$(call gb_Jar_get_target,ridl)" \ - -Dext.ooo.unoil.lib="$(call gb_Jar_get_target,unoil)" \ - dist && \ - touch $@ - -# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/JLanguageTool-1.4.0-no-hc.patch b/external/languagetool/JLanguageTool-1.4.0-no-hc.patch deleted file mode 100644 index 4337ec6eb697..000000000000 --- a/external/languagetool/JLanguageTool-1.4.0-no-hc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:18:05.118789546 +0100 -+++ misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:17:02.385235706 +0100 -@@ -82,7 +82,6 @@ - <include name="openoffice/Linguistic.xcu"/> - <include name="openoffice/description.xml"/> - <include name="openoffice/images/dialog.png"/> -- <include name="openoffice/images/dialogh.png"/> - <include name="openoffice/images/LanguageToolBig.png"/> - <include name="openoffice/images/LanguageToolSmall.png"/> - <include name="openoffice/images/dialog.png"/> ---- misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2011-06-26 20:29:43.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2012-02-29 22:17:25.551071099 +0100 -@@ -27,9 +27,6 @@ - <prop oor:name="SpellAndGrammarDialogImage" oor:type="xs:string"> - <value>%origin%/images/dialog.png</value> - </prop> -- <prop oor:name="SpellAndGrammarDialogImage_HC" oor:type="xs:string"> -- <value>%origin%/images/dialogh.png</value> -- </prop> - </node> - </node> - </node> diff --git a/external/languagetool/JLanguageTool-1.7.0.patch b/external/languagetool/JLanguageTool-1.7.0.patch deleted file mode 100644 index 782b683af79e..000000000000 --- a/external/languagetool/JLanguageTool-1.7.0.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Naur misc/build/JLanguageTool-1.7.0/build.xml misc/build/JLanguageTool-1.7.0_patched/build.xml ---- misc/build/JLanguageTool-1.7.0/build.xml 2012-06-25 08:22:35.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/build.xml 2012-06-25 09:27:39.077442000 +0200 -@@ -29,7 +29,9 @@ - <pathelement location="${ext.CJFtransform.lib}" /> - <pathelement location="${ext.commons-validator.lib}" /> - <!-- --> -- <pathelement location="${ext.ooo.juh.lib}" /> -+ <pathelement location="${ext.junit.lib}"/> -+ <!-- --> -+ <pathelement location="${ext.ooo.juh.lib}" /> - <pathelement location="${ext.ooo.unoil.lib}" /> - <pathelement location="${ext.ooo.ridl.lib}" /> - <pathelement location="${ext.ooo.jurt.lib}" /> -@@ -442,11 +444,11 @@ - <!-- ================================================================== --> - - <target name="dist" depends="ooo-internal" description="Builds one ZIP for both OpenOffice.org and stand-alone use"> --<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> -+<zip compress="yes" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> - </target> - - <target name="fast" depends="ooo-internal" description="like dist, but without ZIP compression (for development only)"> --<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> -+<zip compress="no" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> - </target> - - <target name="common" depends="clean,init,build,ooo-build"> -@@ -651,7 +653,6 @@ - <copy file="${resource.dir}/ast/asturian.dict" todir="${dist.dir}/resource/ast" /> - <copy file="${resource.dir}/ast/asturian.info" todir="${dist.dir}/resource/ast" /> - -- <copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" /> - <copy todir="${dist.dir}/rules"> - <fileset dir="src/rules" excludes="CVS" /> - </copy> -@@ -678,7 +678,7 @@ - - <filter filtersFile="ooolocales.properties" /> - <copy filtering="true" encoding="${encoding}" todir="${dist.dir}/"> -- <fileset dir="openoffice/" includes="description.xml,*.xcu,Options.xdl,META-INF/**" /> -+ <fileset dir="openoffice/" includes="components.rdb,description.xml,*.xcu,Options.xdl,META-INF/**" /> - </copy> - <copy todir="${dist.dir}/"> - <fileset dir="openoffice/" includes="images/**,help/**" /> -diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/components.rdb misc/build/JLanguageTool-1.7.0_patched/openoffice/components.rdb ---- misc/build/JLanguageTool-1.7.0/openoffice/components.rdb 1970-01-01 01:00:00.000000000 +0100 -+++ misc/build/JLanguageTool-1.7.0_patched/openoffice/components.rdb 2012-06-25 10:26:23.183633100 +0200 -@@ -0,0 +1,9 @@ -+<?xml version="1.0"?> -+<components xmlns="http://openoffice.org/2010/uno-components"> -+ <component loader="com.sun.star.loader.Java2" uri="./LanguageTool.uno.jar"> -+ <implementation name="org.languagetool.openoffice.Main"> -+ <service name="com.sun.star.linguistic2.Proofreader"/> -+ <service name="org.languagetool.openoffice.Main"/> -+ </implementation> -+ </component> -+</components> -diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/META-INF/manifest.xml misc/build/JLanguageTool-1.7.0_patched/openoffice/META-INF/manifest.xml ---- misc/build/JLanguageTool-1.7.0/openoffice/META-INF/manifest.xml 2012-06-25 08:22:34.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/openoffice/META-INF/manifest.xml 2012-06-25 09:39:56.751738000 +0200 -@@ -2,8 +2,8 @@ - <manifest:manifest> - <manifest:file-entry manifest:full-path="Addons.xcu" - manifest:media-type="application/vnd.sun.star.configuration-data" /> -- <manifest:file-entry manifest:full-path="LanguageTool.uno.jar" -- manifest:media-type="application/vnd.sun.star.uno-component;type=Java" /> -+ <manifest:file-entry manifest:full-path="components.rdb" -+ manifest:media-type="application/vnd.sun.star.uno-components" /> - <manifest:file-entry - manifest:media-type="application/vnd.sun.star.configuration-data" - manifest:full-path="Linguistic.xcu" /> -diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/description.xml misc/build/JLanguageTool-1.7.0_patched/openoffice/description.xml ---- misc/build/JLanguageTool-1.7.0/openoffice/description.xml 2012-06-25 08:22:35.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/openoffice/description.xml 2012-06-25 10:29:48.520591800 +0200 -@@ -21,7 +21,7 @@ - <name lang="zh">LanguageTool. 开源的语言检查工具</name> - <name lang="br">LanguageTool. Reizher reizhskrivadurel frank.</name> - </display-name> -- <version value="@version@" /> -+ <version value="1.7.1" /> - <release-notes> - <src xlink:href="CHANGES.txt" lang="en" /> - </release-notes> -diff -Naur misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/gui/Configuration.java misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/gui/Configuration.java ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/gui/Configuration.java 2012-06-25 08:21:31.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/gui/Configuration.java 2012-06-25 09:31:40.737466400 +0200 -@@ -23,6 +23,7 @@ - import java.io.FileNotFoundException; - import java.io.FileOutputStream; - import java.io.IOException; -+import java.lang.ClassLoader; - import java.util.*; - - import org.languagetool.Language; -@@ -142,7 +143,18 @@ - - final String motherTongueStr = (String) props.get(MOTHER_TONGUE_CONFIG_KEY); - if (motherTongueStr != null) { -- motherTongue = Language.getLanguageForShortName(motherTongueStr); -+ // FIXME: hack to disable the functionality for JRE 1.5 -+ // javax.xml.bind.JAXBException is part of JRE 1.6 -+ boolean isJRE15 = false; -+ try { -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ cl.loadClass("javax.xml.bind.JAXBException"); -+ } catch (ClassNotFoundException e) { -+ isJRE15 = true; -+ } -+ if (!isJRE15) { -+ motherTongue = Language.getLanguageForShortName(motherTongueStr); -+ } - } - - final String autoDetectStr = (String) props.get(AUTO_DETECT_CONFIG_KEY); -diff -Naur misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/Main.java misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/openoffice/Main.java ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/Main.java 2012-06-25 08:21:28.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/openoffice/Main.java 2012-06-25 09:36:03.778528700 +0200 -@@ -24,6 +24,7 @@ - * @author Marcin Miłkowski - */ - import java.io.File; -+import java.lang.ClassLoader; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Comparator; -@@ -494,6 +495,14 @@ - */ - @Override - public final Locale[] getLocales() { -+ // FIXME: hack to disable the functionality for JRE 1.5 -+ // javax.xml.bind.JAXBException is part of JRE 1.6 -+ try { -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ cl.loadClass("javax.xml.bind.JAXBException"); -+ } catch (ClassNotFoundException e) { -+ return new Locale[0]; -+ } - try { - int dims = 0; - for (final Language element : Language.LANGUAGES) { diff --git a/external/languagetool/Makefile b/external/languagetool/Makefile deleted file mode 100644 index e4968cf85fb6..000000000000 --- a/external/languagetool/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/MessageBox-apichange.patch b/external/languagetool/MessageBox-apichange.patch deleted file mode 100644 index ceea259b88ac..000000000000 --- a/external/languagetool/MessageBox-apichange.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/OOoAboutDialog.java 2013-07-11 13:33:26.681387525 +0100 -+++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/OOoAboutDialog.java 2013-07-11 13:34:46.666424549 +0100 -@@ -19,6 +19,7 @@ - package org.languagetool.openoffice; - - import com.sun.star.awt.Rectangle; -+import com.sun.star.awt.MessageBoxType; - import com.sun.star.awt.XMessageBox; - import com.sun.star.awt.XMessageBoxFactory; - import com.sun.star.awt.XWindowPeer; -@@ -49,16 +50,14 @@ - .getString("guiMenuAbout")); - final XMessageBoxFactory messageBoxFactory = (XMessageBoxFactory) UnoRuntime - .queryInterface(XMessageBoxFactory.class, winPeer.getToolkit()); -- final Rectangle messageBoxRectangle = new Rectangle(); - final XMessageBox box = messageBoxFactory - .createMessageBox( - winPeer, -- messageBoxRectangle, -- "infobox", -+ MessageBoxType.INFOBOX, - 0, - aboutDialogTitle, - getAboutText()); - box.execute(); - } - --} -\ No newline at end of file -+} diff --git a/external/languagetool/Module_languagetool.mk b/external/languagetool/Module_languagetool.mk deleted file mode 100644 index 0574d55d6856..000000000000 --- a/external/languagetool/Module_languagetool.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Module_Module,languagetool)) - -ifneq ($(ENABLE_JAVA),) -ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) -$(eval $(call gb_Module_add_targets,languagetool,\ - ExternalProject_languagetool \ - ExtensionPackage_LanguageTool \ - UnpackedTarball_languagetool \ -)) -endif -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/README b/external/languagetool/README deleted file mode 100644 index 1a33382f7c3a..000000000000 --- a/external/languagetool/README +++ /dev/null @@ -1,5 +0,0 @@ -Style and grammar checker for various languages written in Java, from [http://www.languagetool.org/] - -Shipping this is a compile-time option for LibreOffice, but our -downloadable builds use the light-weight lightproof grammar checker -instead to avoid the Java bootstrapping performance issues. diff --git a/external/languagetool/UnpackedTarball_languagetool.mk b/external/languagetool/UnpackedTarball_languagetool.mk deleted file mode 100644 index 757a4b35e797..000000000000 --- a/external/languagetool/UnpackedTarball_languagetool.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,languagetool)) - -$(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL))) - -$(eval $(call gb_UnpackedTarball_set_patchlevel,languagetool,3)) - -$(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ - external/languagetool/JLanguageTool-1.7.0.patch \ - external/languagetool/JLanguageTool-1.4.0-no-hc.patch \ - external/languagetool/MessageBox-apichange.patch \ - external/languagetool/english.ireland.patch \ - external/languagetool/esperanto.territory.patch \ - external/languagetool/french.haiti.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/english.ireland.patch b/external/languagetool/english.ireland.patch deleted file mode 100644 index 2e47d3247b65..000000000000 --- a/external/languagetool/english.ireland.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java.orig 2013-11-18 09:41:10.625421948 +0000 -+++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java 2013-11-18 09:41:25.736570684 +0000 -@@ -67,7 +67,7 @@ - - @Override - public final String[] getCountryVariants() { -- return new String[]{"GB", "US", "AU", "CA", "NZ", "ZA"}; -+ return new String[]{"GB", "US", "AU", "CA", "IE", "NZ", "ZA"}; - } - - @Override diff --git a/external/languagetool/esperanto.territory.patch b/external/languagetool/esperanto.territory.patch deleted file mode 100644 index 6037adc43c07..000000000000 --- a/external/languagetool/esperanto.territory.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java.orig 2013-11-18 10:18:49.111712785 +0000 -+++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java 2013-11-18 10:18:59.254813036 +0000 -@@ -71,8 +71,7 @@ - - @Override - public String[] getCountryVariants() { -- /* return "ANY" country code as a "country-less" placeholder for OOo: */ -- return new String[] {"ANY"}; -+ return new String[] {""}; - } - - @Override diff --git a/external/languagetool/french.haiti.patch b/external/languagetool/french.haiti.patch deleted file mode 100644 index 207699e70cbf..000000000000 --- a/external/languagetool/french.haiti.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java -+++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java -@@ -54,7 +54,7 @@ - @Override - public String[] getCountryVariants() { - return new String[]{"FR", "", "BE", "CH", "CA", "LU", "MC", "CM", -- "CI", "HI", "ML", "SN", "CD", "MA", "RE"}; -+ "CI", "HT", "ML", "SN", "CD", "MA", "RE"}; - } - - @Override diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 4d9e0ab4be6e..e6989058fc93 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2274,12 +2274,6 @@ <hr /> <h1><a id="a__Extensions" name="a__Extensions">Extensions</a></h1> <p>Only third party extensions are listed here whose source code is not in the LibreOffice tree.</p> - <div class="LANGUAGETOOL"> - <h2>LanguageTool Grammar Checker</h2> - <p>The following software may be included in this product: LanguageTool Grammar Checker. Use of any of this - software is governed by the terms of the license below:</p> - <p><a href="#a__LGPL_version_3">Jump to LGPL Version 3</a></p> - </div> <div class="NUMBERTEXT"><!-- FIXME: license_*.xsl written in XSLT 1.0 matches this when LIBNUMBERTEXT is defined --> <h2>Numbertext</h2> <p>The following software may be included in this product: Numbertext. Use of any of this software is governed diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index b7c01529cfff..4f7859695af3 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -48,19 +48,6 @@ End #endif -/* ** LanguageTool ** */ - -#ifdef WITH_EXTENSION_LANGUAGETOOL - -File gid_File_Oxt_LanguageTool - TXT_FILE_BODY; - Styles = (PACKED, FILELIST); - Dir = FILELIST_DIR; - Name = "LanguageTool.filelist"; -End - -#endif - /* ** Script provider for BeanShell ** */ #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 3ab0643b7478..7f8061f99857 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -75,20 +75,6 @@ Module gid_Module_Optional_Extensions_NLPSolver End #endif -/* ** LanguageTool ** */ - -#ifdef WITH_EXTENSION_LANGUAGETOOL -Module gid_Module_Optional_Extensions_LanguageTool - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_LanguageTool ); - Default = YES; - Styles = ( ); -End -#endif - /* ** Script provider for BeanShell ** */ #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 716e00080f70..6218564c08f0 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -40,12 +40,6 @@ en-US = "Solver for Nonlinear Programming" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER] en-US = "Solver for Nonlinear Programming" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL] -en-US = "LanguageTool Open Source language checker" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL] -en-US = "LanguageTool Open Source language checker" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL] en-US = "Script provider for BeanShell" diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt index c9fa7f0cb85d..97b1dd36f09d 100644 --- a/setup_native/source/packinfo/packinfo_extensions.txt +++ b/setup_native/source/packinfo/packinfo_extensions.txt @@ -80,21 +80,6 @@ packageversion = "%PACKAGEVERSION" End Start -module = "gid_Module_Optional_Extensions_LanguageTool" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-languagetool" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" -packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-languagetool" -requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -linuxpatchrequires = "" -copyright = "2005-2009 by Daniel Naber" -solariscopyright = "solariscopyrightfile" -vendor = "The Document Foundation" -description = "LanguageTool extension for %PRODUCTNAME %PRODUCTVERSION" -destpath = "/opt" -packageversion = "%PACKAGEVERSION" -End - -Start module = "gid_Module_Optional_Extensions_Script_Provider_For_BS" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" |