diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:47:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:47:40 +0000 |
| commit | 205d8d0b3fa327d61d1a5e1db46f218afb7da596 (patch) | |
| tree | 2fe395055f7824373c20d3c4261fa8fba00da428 /scp2 | |
| parent | 5f17e0022cc7fd75e27116e604373643ade89b75 (diff) | |
INTEGRATION: CWS ooo20040704 (1.6.10); FILE MERGED
2004/07/19 18:11:29 svesik 1.6.10.2: RESYNC: (1.6-1.7); FILE MERGED
2004/07/15 12:14:30 cmc 1.6.10.1: #i30801# make jvmfwk link with and without java
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 01d4663a5c49..66298eab1e93 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.8 $ +* $Revision: 1.9 $ * -* last change: $Author: kz $ $Date: 2004-08-31 12:46:11 $ +* last change: $Author: rt $ $Date: 2004-09-08 16:47:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -428,8 +428,6 @@ End #ifdef UNX -#ifdef SOLAR_JAVA - Shortcut gid_Shortcut_Lib_Jvmfwk FileID = gid_File_Lib_Jvmfwk; Dir = gid_Dir_Program; @@ -437,14 +435,6 @@ Shortcut gid_Shortcut_Lib_Jvmfwk Styles = (NETWORK,RELATIVE); End -#endif - -#endif - -#ifdef UNX - -#ifdef SOLAR_JAVA - Shortcut gid_Shortcut_Lib_Jvmfwk_2 ShortcutID = gid_Shortcut_Lib_Jvmfwk; Dir = gid_Dir_Program; @@ -454,5 +444,3 @@ End #endif -#endif - |