From 4ad4bfbfea8c324030a7085141c58fd6e9fe1805 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 22 Jan 2021 16:37:07 +0100 Subject: Switch ridl.jar -> libreoffice.jar also in scp2-based fundamental ini-file 35518c92365cc183ba6cce2a4d284a130c0ca13f "Move all public Java classes to libreoffice.jar" had changed URE_MORE_JAVA_TYPES only in the corresponding instdir/ fundamental ini-file generated by instsetoo_native/CustomTarget_setup.mk. Change-Id: I76c65b4f2fc5088b1b9bb1c0976d895b963108b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109822 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- scp2/source/ooo/common_brand.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5eba313cdbc6..213785bff077 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -745,7 +745,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ridl.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; + Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/libreoffice.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data -- cgit v1.2.3