summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:09:23 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:09:23 +0000
commitffe864253b50ba936c4a3968d8ab439de59028f1 (patch)
treec9a7ef47a5084a5f25c3f00ba627e67d51e100a6 /scp2
parent23fee249246e9016ffd8cc3f90b8448afc07f0f6 (diff)
INTEGRATION: CWS nojava1 (1.7.66); FILE MERGED
2004/11/02 22:34:33 haggai 1.7.66.3: RESYNC: (1.9-1.10); FILE MERGED 2004/09/24 14:43:57 haggai 1.7.66.2: RESYNC: (1.7-1.9); FILE MERGED 2004/08/16 15:33:59 cmc 1.7.66.1: #i33045# update scp2 to include jvmaccess and jvmfwk even without java, but drop xslt jars
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/shortcut_ooo.scp7
1 files changed, 5 insertions, 2 deletions
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 4dc82073bf74..57c52d5f4b77 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -2,9 +2,9 @@
*
* $RCSfile: shortcut_ooo.scp,v $
*
-* $Revision: 1.11 $
+* $Revision: 1.12 $
*
-* last change: $Author: pjunck $ $Date: 2004-11-03 09:19:56 $
+* last change: $Author: hr $ $Date: 2004-11-09 12:09:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -426,6 +426,8 @@ End
#ifdef UNX
+#ifdef SOLAR_JAVA
+
Shortcut gid_Shortcut_Lib_Jvmfwk_Linker
FileID = gid_File_Lib_Jvmfwk;
Dir = gid_Dir_Program;
@@ -435,3 +437,4 @@ End
#endif
+#endif