Skip to content

Commit f22968e

Browse files
authored
Update to libre office 7.0.3 (#7150)
remove custom lib merging
1 parent 706865f commit f22968e

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

build.gradle

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ repositories {
8484
}
8585

8686
configurations {
87-
libreoffice
8887
antlr3
8988
antlr4
9089
// TODO: Remove the following workaround for split error messages such as
@@ -117,14 +116,8 @@ dependencies {
117116

118117
implementation 'commons-cli:commons-cli:1.4'
119118

120-
// For Java 9+ compatibility, we include a bundled version of the libreoffice libraries
121-
// See https://bugs.documentfoundation.org/show_bug.cgi?id=117331#c8 for background information
122-
// Use the task bundleLibreOffice to update the bundled jar
123-
// DO NOT CHANGE THE libreoffice PREFIX
124-
libreoffice 'org.libreoffice:juh:6.4.3'
125-
libreoffice 'org.libreoffice:jurt:6.4.3'
126-
libreoffice 'org.libreoffice:ridl:6.4.3'
127-
libreoffice 'org.libreoffice:unoil:6.4.3'
119+
implementation 'org.libreoffice:libreoffice:7.0.3'
120+
implementation 'org.libreoffice:unoloader:7.0.3'
128121

129122
implementation 'io.github.java-diff-utils:java-diff-utils:4.9'
130123
implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -767,13 +760,4 @@ task downloadDependencies {
767760
}
768761
}
769762

770-
task bundleLibreOffice(type: Jar) {
771-
from configurations.libreoffice.collect { zipTree it }
772763

773-
manifest {
774-
attributes 'Automatic-Module-Name': 'org.jabref.thirdparty.libreoffice'
775-
}
776-
777-
destinationDir = file('lib')
778-
archiveName = 'libreoffice.jar'
779-
}

lib/libreoffice.jar

-2.03 MB
Binary file not shown.

src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
requires applicationinsights.core;
4848

4949
// Libre Office
50-
requires org.jabref.thirdparty.libreoffice;
50+
requires org.libreoffice.uno;
5151

5252
// Other modules
5353
requires commons.logging;

src/main/java/org/jabref/gui/openoffice/OOBibBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ public BibDatabase generateDatabase(List<BibDatabase> databases)
12671267
throws NoSuchElementException, WrappedTargetException {
12681268
BibDatabase resultDatabase = new BibDatabase();
12691269
List<String> cited = findCitedKeys();
1270-
List<BibEntry> entriesToInsert = new ArrayList<BibEntry>();
1270+
List<BibEntry> entriesToInsert = new ArrayList<>();
12711271

12721272
// For each cited key
12731273
for (String key : cited) {

0 commit comments

Comments
 (0)