Use toplevel LibO dir for APPLICATION_HOME_KEY

Align OfficeLoader with rest of codebase, append program/ instead of expecting it as part of APPLICATION_HOME_KEY This fixes #11.
LibreOffice · Jul 4, 2016 · f37f9fa · f37f9fa
1 parent 8867a65
commit f37f9fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/examples/calc/Snippet15.java b/examples/calc/Snippet15.java
@@ -27,7 +27,7 @@
 
 public class SimpleCalcTest {
 
-    private final static String OPEN_OFFICE_ORG_PATH = "/usr/lib64/libreoffice/program";
+    private final static String OPEN_OFFICE_ORG_PATH = "/usr/lib64/libreoffice";
     public static HashMap<String, String> configuration = new HashMap<String, String>();
     static {
         configuration.put(IOfficeApplication.APPLICATION_HOME_KEY, OPEN_OFFICE_ORG_PATH);

diff --git a/src/Lo4ConnectionTest.java b/src/Lo4ConnectionTest.java
@@ -7,7 +7,7 @@
 
 public class Lo4ConnectionTest {
 
-    private final static String LIBREOFFICE_PATH = "/usr/lib64/libreoffice/program";
+    private final static String LIBREOFFICE_PATH = "/usr/lib64/libreoffice";
     public static HashMap<String, String> configuration = new HashMap<String, String>();
     static {
         configuration.put(IOfficeApplication.APPLICATION_HOME_KEY, LIBREOFFICE_PATH);

diff --git a/src/ag/ion/bion/officelayer/util/OfficeLoader.java b/src/ag/ion/bion/officelayer/util/OfficeLoader.java
@@ -199,7 +199,9 @@ private static void callUnoinfo(String path, ArrayList<URL> urls) {
         Process p;
         try {
             p = Runtime.getRuntime().exec(
-                new String[] { new File(path, "unoinfo").getPath(), "java" });
+                new String[] {
+                    new File( new File(path, "program"),
+                              "unoinfo").getPath(), "java" });
         } catch (IOException e) {
             System.err.println(
                 OfficeLoader.class.getName() + "::getCustomLoader: exec" +