From aef949b3d2a940efb352cb505385dd9e63616d15 Mon Sep 17 00:00:00 2001 From: sweetvvck Date: Thu, 3 Dec 2015 09:23:15 +0800 Subject: [PATCH] Compatible with latest OpenOffice on MacOS fix bug on MacOS: ``` Failed tests: runAllPossibleConversions(org.artofsolving.jodconverter.OfficeDocumentConverterFunctionalTest): officeHome not set and could not be auto-detected executeTask(org.artofsolving.jodconverter.office.ExternalOfficeManagerTest): Cannot run program "/Users/chengke/Workspace/opensource/jodconverter_git/jodconverter-core/MacOS/soffice.bin": error=2, No such file or directory executeTask(org.artofsolving.jodconverter.office.PooledOfficeManagerTest): failed to start and connect restartAfterCrash(org.artofsolving.jodconverter.office.PooledOfficeManagerTest): failed to start and connect restartAfterTaskTimeout(org.artofsolving.jodconverter.office.PooledOfficeManagerTest): failed to start and connect restartWhenMaxTasksPerProcessReached(org.artofsolving.jodconverter.office.PooledOfficeManagerTest): failed to start and connect ``` --- .../java/org/artofsolving/jodconverter/office/OfficeUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java index f427bd752..56c139fd7 100644 --- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java +++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java @@ -77,7 +77,8 @@ public static File getDefaultOfficeHome() { } else if (PlatformUtils.isMac()) { return findOfficeHome( "/Applications/OpenOffice.org.app/Contents", - "/Applications/LibreOffice.app/Contents" + "/Applications/LibreOffice.app/Contents", + "/Applications/OpenOffice.app/Contents" ); } else { // Linux or other *nix variants