summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Jar_active_java.mk1
-rw-r--r--desktop/Jar_passive_java.mk1
-rwxr-xr-xdesktop/scripts/unoinfo-mac.sh5
-rwxr-xr-xdesktop/scripts/unoinfo.sh6
-rw-r--r--desktop/win32/source/unoinfo.cxx4
5 files changed, 5 insertions, 12 deletions
diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk
index 5fa49e840297..6e1be1adaed3 100644
--- a/desktop/Jar_active_java.mk
+++ b/desktop/Jar_active_java.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Jar_set_packageroot,active_java,com))
$(eval $(call gb_Jar_use_jars,active_java, \
juh \
ridl \
- unoil \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
index e1023a5d5230..007a37e8e6d6 100644
--- a/desktop/Jar_passive_java.mk
+++ b/desktop/Jar_passive_java.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Jar_set_packageroot,passive_java,com))
$(eval $(call gb_Jar_use_jars,passive_java, \
juh \
ridl \
- unoil \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh
index ba9dcf7f6281..c8728a0e5e30 100755
--- a/desktop/scripts/unoinfo-mac.sh
+++ b/desktop/scripts/unoinfo-mac.sh
@@ -36,11 +36,10 @@ c++)
printf '%s' "$sd_prog/../Frameworks"
;;
java)
- printf '0%s\0%s\0%s\0%s\0%s' \
+ printf '0%s\0%s\0%s' \
"$sd_prog/../Resources/java/ridl.jar" \
- "$sd_prog/../Resources/java/jurt.jar" \
"$sd_prog/../Resources/java/juh.jar" \
- "$sd_prog/../Resources/java/unoil.jar" "$sd_prog"
+ "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 4e660624bfb7..297acf3169d8 100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -36,9 +36,9 @@ c++)
printf '%s' "$sd_prog"
;;
java)
- printf '0%s\0%s\0%s\0%s\0%s' \
- "$sd_prog/classes/ridl.jar" "$sd_prog/classes/jurt.jar" \
- "$sd_prog/classes/juh.jar" "$sd_prog/classes/unoil.jar" "$sd_prog"
+ printf '0%s\0%s\0%s' \
+ "$sd_prog/classes/ridl.jar" \
+ "$sd_prog/classes/juh.jar" "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 3a41b6e0985e..f86232feb64f 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -77,12 +77,8 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t * pathEnd = getBrandPath(path);
writePath(path, pathEnd, MY_STRING(L"classes\\ridl.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
- writeNull();
writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
- writeNull();
writePath(path, pathEnd, MY_STRING(L""));
} else {
exit(EXIT_FAILURE);