diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:54:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:54:55 +0000 |
| commit | bcc1f5e605e103a7d2558511496404719b7ffc33 (patch) | |
| tree | d3715b64ef78deea5dca77ff62e5bf679884e632 /scp2 | |
| parent | 59d38c4282f3e96cf0a8d76b50ace574bd7e5daa (diff) | |
INTEGRATION: CWS buildcond02 (1.14.10); FILE MERGED
2005/01/06 17:20:07 mmeeks 1.14.10.2: RESYNC: (1.14-1.16); FILE MERGED
2004/12/09 14:35:25 mmeeks 1.14.10.1: Issue number: #i29937# #i36764# #i35742#
Submitted by: mmeeks
Allow binfilter to be disabled & not packaged
Fix bugs with system python packaging
Allow myspell dictionaries not to be packaged.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index bf701fac336e..6dd1b768962b 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_resource_ooo.scp,v $ * -* $Revision: 1.16 $ +* $Revision: 1.17 $ * -* last change: $Author: rt $ $Date: 2004-12-16 11:03:17 $ +* last change: $Author: hr $ $Date: 2005-02-11 15:54:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,6 +136,7 @@ STD_RES_FILE( gid_File_Res_Sch, sch ) // start binfilter #110743# // +#ifndef WITHOUT_BINFILTER STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm ) @@ -143,6 +144,7 @@ STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa ) STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd ) STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw ) STD_RES_FILE( gid_File_Res_Bf_Sfx, bf_sfx ) +#endif // // end binfilter #110743# |