INTEGRATION: CWS sysint1 (1.42.2); FILE MERGED

2004/11/17 16:14:36 is 1.42.2.2: #118340# cleanup scp
2004/11/16 14:12:46 is 1.42.2.1: #i36828# new shellnew files
This commit is contained in:
Jens-Heiner Rechtien 2004-11-26 21:22:06 +00:00
parent ff6fc8d3e4
commit 0e65d4929e

View file

@ -2,9 +2,9 @@
*
* $RCSfile: file_ooo.scp,v $
*
* $Revision: 1.52 $
* $Revision: 1.53 $
*
* last change: $Author: hr $ $Date: 2004-11-26 20:47:35 $
* last change: $Author: hr $ $Date: 2004-11-26 22:22:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -289,18 +289,6 @@ End
#endif
File gid_File_Bin_Setup
BIN_FILE_BODY;
Dir = gid_Dir_Program;
Name = EXENAME(setup);
#ifdef WNT
Styles = (PACKED, SETUPZIP, PATCH_SO_NAME);
#endif
#ifdef UNX
Styles = (PACKED, SETUPZIP, UNIX_SOFTLINK);
#endif
End
File gid_File_Bin_Soffice
BIN_FILE_BODY;
Dir = gid_Dir_Program;
@ -427,20 +415,8 @@ End
#endif
#ifdef UNX
File gid_File_Binary_Setup
BIN_FILE_BODY;
Name = "setup.bin";
Dir = gid_Dir_Program;
Styles = (PACKED, SETUPZIP);
End
#endif
STD_SETUPZIP_BMP_FILE( gid_File_Bmp_Installation, oo_product.bmp )
File gid_File_Dtd_Accelerator
TXT_FILE_BODY;
Styles = (PACKED);
@ -536,28 +512,6 @@ End
#endif
#ifdef WNT
File gid_File_Exe_Regsvrex
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
Name = "regsvrex.exe";
End
#endif
#ifdef WNT
File gid_File_Exe_Sbase
BIN_FILE_BODY;
Dir = gid_Dir_Program;
Name = EXENAME(sbase);
Styles = (PACKED);
End
#endif
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
STD_FILTER_FILE( gid_File_Filter_Emp, emp)
@ -617,13 +571,6 @@ File gid_File_Images_Zip
Styles = (PACKED,SETUPZIP);
End
File gid_File_Images_Zip_Setup
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images2.zip";
Styles = (ARCHIVE,SETUPZIP);
End
File gid_File_Inethist_Dat_Delete_Only
TXT_FILE_BODY;
Dir = gid_Dir_User_Config;
@ -1769,13 +1716,6 @@ End
#endif
File gid_File_Rdb_Setup_Services
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Styles = (PACKED, OVERWRITE, SETUPZIP);
Name = "setup_services.rdb";
End
File gid_File_Rdb_Types
TXT_FILE_BODY;
Dir = gid_Dir_Program;
@ -2106,25 +2046,25 @@ STD_SHELLNEW_FILE(gid_File_Shellnew_Html_Soffice, soffice.html)
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Sxc_Soffice, soffice.sxc)
STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Sxd_Soffice, soffice.sxd)
STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Sxi_Soffice, soffice.sxi)
STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
#endif
#ifdef WNT
STD_SHELLNEW_FILE(gid_File_Shellnew_Sxw_Soffice, soffice.sxw)
STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
#endif