diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 13:15:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 13:15:39 +0000 |
| commit | 6bb050cd22a1e2991255f2597d4507300e078ffc (patch) | |
| tree | e74ff34f81a46a6cb95c876492a29158e22f9a02 /scp2 | |
| parent | 569277cb95a539992ac1e6809dfa9befa4dc43a6 (diff) | |
INTEGRATION: CWS pj50 (1.139.8); FILE MERGED
2006/02/20 17:33:51 pjanik 1.139.8.2: RESYNC: (1.139-1.142); FILE MERGED
2006/02/17 06:52:03 pjanik 1.139.8.1: #i59729#: Honour WITHOUT_MOZILLA again (patch from thb).
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 85e7029add0f..c56cc13e7b9d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_ooo.scp,v $ * - * $Revision: 1.143 $ + * $Revision: 1.144 $ * - * last change: $Author: rt $ $Date: 2006-03-07 09:43:18 $ + * last change: $Author: rt $ $Date: 2006-03-08 14:15:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk End #endif +#ifndef WITHOUT_MOZILLA + #if !defined(UNX) || defined(ENABLE_GTK) File gid_File_Lib_Npsoplugin BIN_FILE_BODY; @@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin #endif End #endif +#endif File gid_File_Bin_Uno BIN_FILE_BODY; @@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal Name = "gengal.rdb"; End -#ifdef UNX +#if !defined(WITHOUT_MOZILLA) && defined(UNX) File gid_File_Bin_Pluginapp BIN_FILE_BODY; |