From 0f71008915536b79eee59a769d52813dc2aa7575 Mon Sep 17 00:00:00 2001
From: Katarina Behrens
Date: Tue, 23 Feb 2016 23:09:56 +0100
Subject: [PATCH] Planted FIXMEs
---
src/ag/ion/bion/officelayer/util/InstallationFinder.java | 3 +++
src/ag/ion/bion/officelayer/util/OfficeLoader.java | 2 ++
src/ag/ion/bion/officelayer/util/WinRegKey.java | 1 +
3 files changed, 6 insertions(+)
diff --git a/src/ag/ion/bion/officelayer/util/InstallationFinder.java b/src/ag/ion/bion/officelayer/util/InstallationFinder.java
index c0d6ea9..94cec4b 100644
--- a/src/ag/ion/bion/officelayer/util/InstallationFinder.java
+++ b/src/ag/ion/bion/officelayer/util/InstallationFinder.java
@@ -73,6 +73,7 @@
* the user's home directory. Note, that the .sversionrc file will be omitted
* for OOo 2.0
*/
+//FIXME: split this class into InstallationFinderUnix and InstallationFinderWindows
final class InstallationFinder {
private static final String SYSPROP_NAME =
@@ -124,6 +125,8 @@ public static String getPath() {
if ( osname.startsWith( "Windows" ) ) {
// get the installation path from the Windows Registry
// (Windows platform only)
+ // FIXME: this doesn't work currently as it needs unowinreg.dll
+ // (part of Libreoffice SDK) which we don't have
path = getPathFromWindowsRegistry();
} else {
// get the installation path from the PATH environment
diff --git a/src/ag/ion/bion/officelayer/util/OfficeLoader.java b/src/ag/ion/bion/officelayer/util/OfficeLoader.java
index b5cc3f6..0dc7c51 100644
--- a/src/ag/ion/bion/officelayer/util/OfficeLoader.java
+++ b/src/ag/ion/bion/officelayer/util/OfficeLoader.java
@@ -210,6 +210,8 @@ private static void callUnoinfo(String path, ArrayList urls) {
" unoinfo: " + e);
return;
}
+ //FIXME: perhaps remove this one & the whole Drain class entirely
+ //we're not doing anything w/ content of stderr anyway
new Drain(p.getErrorStream()).start();
int code;
byte[] buf = new byte[1000];
diff --git a/src/ag/ion/bion/officelayer/util/WinRegKey.java b/src/ag/ion/bion/officelayer/util/WinRegKey.java
index 2738058..388eea3 100644
--- a/src/ag/ion/bion/officelayer/util/WinRegKey.java
+++ b/src/ag/ion/bion/officelayer/util/WinRegKey.java
@@ -69,6 +69,7 @@ private static native boolean winreg_RegQueryInfoKey(
long[] maxValueLen, long[] secDescriptor );
// load the native library unowinreg.dll
+ // FIXME: drop dependency on unowinreg.dll and use com.ice.jni.registry instead
static {
try {
ClassLoader cl = WinRegKey.class.getClassLoader();