summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_ooo.scp14
1 files changed, 9 insertions, 5 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 33279783e9ba..62361e65e11c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -707,25 +707,29 @@ File gid_File_Share_Registry_Ctlseqcheck_Xcd
Name (th) = "ctlseqcheck.xcd";
End
-File gid_File_Scripts_Beanshell
+#ifdef SOLAR_JAVA
+File gid_File_Scripts_Java
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
- Name = "ScriptsBeanShell.zip";
+ Name = "ScriptsJava.zip";
End
-#ifdef SOLAR_JAVA
-File gid_File_Scripts_Java
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+File gid_File_Scripts_Beanshell
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
- Name = "ScriptsJava.zip";
+ Name = "ScriptsBeanShell.zip";
End
#endif
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
File gid_File_Scripts_Javascript
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
Name = "ScriptsJavaScript.zip";
End
+#endif
+#endif
// new user interface configuration files
File gid_File_Share_Config_Sofficecfg_uiconfig_Zip