INTEGRATION: CWS jl14 (1.59.16); FILE MERGED

2004/11/09 10:12:17 is 1.59.16.1: #i36821# assembly values into scp
This commit is contained in:
Kurt Zenker 2004-11-26 17:37:21 +00:00
parent 927454d5ef
commit 0ce57f2620

View file

@ -2,9 +2,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
* $Revision: 1.69 $
* $Revision: 1.70 $
*
* last change: $Author: obo $ $Date: 2004-11-23 09:59:40 $
* last change: $Author: kz $ $Date: 2004-11-26 18:37:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -208,7 +208,6 @@ End
// STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
// STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
/*
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Cppuhelper
@ -219,20 +218,23 @@ File gid_File_Lib_Cli_Cppuhelper
End
#endif
*/
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
Styles = (PACKED);
Styles = (PACKED, ASSEMBLY);
Name = "cli_cppuhelper.dll";
Dir = gid_Dir_Program;
Assemblyname = "cli_cppuhelper";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "1.0.0.0";
Culture = "neutral";
Attributes = "0";
End
#endif
/*
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Types
@ -243,15 +245,19 @@ File gid_File_Lib_Cli_Types
End
#endif
*/
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Types_Assembly
TXT_FILE_BODY;
Styles = (PACKED);
Styles = (PACKED, ASSEMBLY);
Name = "cli_types.dll";
Dir = gid_Dir_Program;
Assemblyname = "cli_types";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "1.1.0.0";
Culture = "neutral";
Attributes = "0";
End
#endif
@ -262,7 +268,23 @@ File gid_File_Lib_Cli_Basetypes
TXT_FILE_BODY;
Styles = (PACKED);
Name = "cli_basetypes.dll";
Dir = gid_Dir_Program_Assembly;
End
#endif
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Basetypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY);
Name = "cli_basetypes.dll";
Dir = gid_Dir_Program;
Assemblyname = "cli_basetypes";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "1.0.0.0";
Culture = "neutral";
Attributes = "0";
End
#endif
@ -278,7 +300,6 @@ End
#endif
/*
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Ure
@ -289,15 +310,19 @@ File gid_File_Lib_Cli_Ure
End
#endif
*/
#if defined WNT && (defined M1300 || defined M1310) // currently the only cli platform
File gid_File_Lib_Cli_Ure_Assembly
TXT_FILE_BODY;
Styles = (PACKED);
Styles = (PACKED, ASSEMBLY);
Name = "cli_ure.dll";
Dir = gid_Dir_Program;
Assemblyname = "cli_ure";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "1.0.0.0";
Culture = "neutral";
Attributes = "0";
End
#endif
@ -1226,17 +1251,6 @@ File gid_File_Lib_Namingservice
#endif
End
#ifdef WNT
File gid_File_Lib_Netframework
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
Name = "netframework.dll";
End
#endif
File gid_File_Lib_Odbc_2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);