diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 10:46:56 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 10:46:56 +0000 |
| commit | ee9908f3ef5b27035c4d3df9127c95d434396438 (patch) | |
| tree | 9fde1be139cd74f273e49073b6d6d1f388105415 | |
| parent | 3c46bfab3435de10194ee48610043c944c3967b4 (diff) | |
INTEGRATION: CWS jl106 (1.294.6); FILE MERGED
2008/07/02 14:20:49 jl 1.294.6.1: #i91168# cli assemblies not for mingw
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 7054e4e50ad9..f4170ff868ea 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: file_library_ooo.scp,v $ - * $Revision: 1.300 $ + * $Revision: 1.301 $ * * This file is part of OpenOffice.org. * @@ -137,7 +137,7 @@ STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools) STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview) -#if defined WNT +#if defined WNT && defined MSC File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; @@ -155,7 +155,8 @@ File gid_File_Lib_Cli_Oootypes_Assembly End #endif -#if defined WNT + +#if defined WNT && defined MSC File gid_File_Lib_Policy_Cli_Oootypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -173,7 +174,7 @@ End #endif -#if defined WNT +#if defined WNT && defined MSC File gid_File_Lib_Policy_Cli_Oootypes_Config TXT_FILE_BODY; |