diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:47:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:47:21 +0000 |
| commit | 5f17e0022cc7fd75e27116e604373643ade89b75 (patch) | |
| tree | 6655db64481178bf78816d3cf1b8d3fed5ed7ea8 /scp2/source | |
| parent | 0415a7fafef62f8b0b59c08b199a1b1cff157da9 (diff) | |
INTEGRATION: CWS ooo20040704 (1.21.2); FILE MERGED
2004/08/09 14:45:56 vg 1.21.2.3: RESYNC MERGED 1.25 1.26
Everything below this line will be added to the revision comment.
2004/07/19 18:07:55 svesik 1.21.2.2: RESYNC: (1.21-1.25); FILE MERGED
2004/06/30 15:47:24 cmc 1.21.2.1: #i30801# allow using system libs if possible
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 97e3ca4fb05b..f48285120138 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_ooo.scp,v $ * -* $Revision: 1.33 $ +* $Revision: 1.34 $ * -* last change: $Author: obo $ $Date: 2004-09-08 14:59:28 $ +* last change: $Author: rt $ $Date: 2004-09-08 16:47:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -264,12 +264,14 @@ End #ifdef UNX +#ifndef WITHOUT_MOZILLA File gid_File_Bin_Pluginapp BIN_FILE_BODY; Dir = gid_Dir_Program; Name = "pluginapp.bin"; Styles = (PACKED); End +#endif #endif @@ -1762,11 +1764,13 @@ File gid_File_Scripts_Beanshell Name = "ScriptsBeanShell.zip"; End +#ifdef SOLAR_JAVA File gid_File_Scripts_Java Dir = gid_Dir_Share_Scripts; ARCHIVE_TXT_FILE_BODY; Name = "ScriptsJava.zip"; End +#endif File gid_File_Scripts_Javascript Dir = gid_Dir_Share_Scripts; |