summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Jar_active_java.mk3
-rw-r--r--desktop/Jar_passive_java.mk3
-rwxr-xr-xdesktop/scripts/unoinfo-mac.sh5
-rwxr-xr-xdesktop/scripts/unoinfo.sh6
-rw-r--r--desktop/win32/source/unoinfo.cxx4
5 files changed, 8 insertions, 13 deletions
diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk
index 6e1be1adaed3..48fb7425efb7 100644
--- a/desktop/Jar_active_java.mk
+++ b/desktop/Jar_active_java.mk
@@ -20,8 +20,7 @@ $(eval $(call gb_Jar_set_manifest,active_java,$(SRCDIR)/desktop/test/deployment/
$(eval $(call gb_Jar_set_packageroot,active_java,com))
$(eval $(call gb_Jar_use_jars,active_java, \
- juh \
- ridl \
+ libreoffice \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
index 007a37e8e6d6..e2408ae5a09f 100644
--- a/desktop/Jar_passive_java.mk
+++ b/desktop/Jar_passive_java.mk
@@ -22,8 +22,7 @@ $(eval $(call gb_Jar_set_manifest,passive_java,$(SRCDIR)/desktop/test/deployment
$(eval $(call gb_Jar_set_packageroot,passive_java,com))
$(eval $(call gb_Jar_use_jars,passive_java, \
- juh \
- ridl \
+ libreoffice \
))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh
index c8728a0e5e30..b67882db0015 100755
--- a/desktop/scripts/unoinfo-mac.sh
+++ b/desktop/scripts/unoinfo-mac.sh
@@ -36,9 +36,8 @@ c++)
printf '%s' "$sd_prog/../Frameworks"
;;
java)
- printf '0%s\0%s\0%s' \
- "$sd_prog/../Resources/java/ridl.jar" \
- "$sd_prog/../Resources/java/juh.jar" \
+ printf '0%s\0%s' \
+ "$sd_prog/../Resources/java/libreoffice.jar" \
"$sd_prog"
;;
*)
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 297acf3169d8..14cba806447b 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' \
- "$sd_prog/classes/ridl.jar" \
- "$sd_prog/classes/juh.jar" "$sd_prog"
+ printf '0%s\0%s' \
+ "$sd_prog/classes/libreoffice.jar" \
+ "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index f86232feb64f..14cee8819dde 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -75,9 +75,7 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
}
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
- writePath(path, pathEnd, MY_STRING(L"classes\\ridl.jar"));
- writeNull();
- writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\libreoffice.jar"));
writeNull();
writePath(path, pathEnd, MY_STRING(L""));
} else {