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 @@ - + + + @@ -442,11 +444,11 @@ - + - + @@ -651,7 +653,6 @@ - @@ -678,7 +678,7 @@ - + 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 @@ + + + + + + + + + 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 @@ - + 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 @@ LanguageTool. 开源的语言检查工具 LanguageTool. Reizher reizhskrivadurel frank. - + 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) { alue='distro/mimo/mimo-7-0'>distro/mimo/mimo-7-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sc/util
AgeCommit message (Expand)Author
2013-02-02fdo#57180 add calc function NUMBERVALUE as defined in ODFF1.2Winfried Donkers
2013-01-11fdo#56124 add functions IFERROR and IFNA to calc as in ODFF1.2Winfried Donkers
2012-12-15calcishmakkica: #i90269# #i95144# #i101466# implement SUMIFS, AVERAGEIFS, COU...Marina Plakalovic
2012-12-15calcishmakkica: #i101466# implement AVERAGEIFMarina Plakalovic
2012-12-04re-base on ALv2 code. Includes:Michael Meeks