diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-06-18 15:36:54 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-06-18 15:36:54 +0000 |
commit | d38955b31070cd2706d9f94b8e089381fdad65d5 (patch) | |
tree | 3f4a0039fbba1a9b20bf309933a0384a5316af21 /scp2/source/ooo/file_resource_ooo.scp | |
parent | 217d540919b98edeee09b61f2d966fb41dff3a88 (diff) |
INTEGRATION: CWS pj81 (1.53.26); FILE MERGED
2007/06/10 13:01:20 pjanik 1.53.26.1: #i78272#: Do not include spa resource file on AQUA, only for X11.
Diffstat (limited to 'scp2/source/ooo/file_resource_ooo.scp')
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index be47b7eb26c7..5421e8e426ca 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_resource_ooo.scp,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: vg $ $Date: 2007-05-22 15:28:13 $ + * last change: $Author: kz $ $Date: 2007-06-18 16:36:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ STD_RES_FILE_PATCH( gid_File_Res_Sd, sd ) STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx ) -#ifdef UNX +#if defined(UNX) && !defined(QUARTZ) STD_RES_FILE_PATCH( gid_File_Res_Spa, spa ) |