diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-20 11:51:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-20 11:51:29 +0000 |
| commit | 9a69ab93c005a27af884d19bf6889d461d7bf1a1 (patch) | |
| tree | 1f5dfafa1270922b946592d5cd818dd0985f1407 /scp2/source | |
| parent | b4fe33a642ef70b8c7ec9fb16b9e23a4997b45e0 (diff) | |
INTEGRATION: CWS fwk18 (1.107.26); FILE MERGED
2005/07/18 18:51:55 as 1.107.26.4: #124346# add filter packages to patch
2005/07/11 08:20:11 as 1.107.26.3: resolve merge conflict
2005/06/29 14:23:12 dbo 1.107.26.2: #i50979#
2005/06/29 08:47:32 dbo 1.107.26.1: #i50979##i49225# patch flags
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 80ccbd16d8f7..e340d7c3e63e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * -* $Revision: 1.132 $ +* $Revision: 1.133 $ * -* last change: $Author: obo $ $Date: 2005-07-20 10:01:24 $ +* last change: $Author: obo $ $Date: 2005-07-20 12:51:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1328,7 +1328,7 @@ File gid_File_Lib_Deployment #else Name = STRING(CONCAT4(deployment,OFFICEUPD,DLLSUFFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_UNO_LIB_FILE_BODY_PATCH; End File gid_File_Lib_DeploymentGui @@ -1337,7 +1337,7 @@ File gid_File_Lib_DeploymentGui #else Name = STRING(CONCAT4(deploymentgui,OFFICEUPD,DLLSUFFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_UNO_LIB_FILE_BODY_PATCH; End STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl) @@ -1487,7 +1487,7 @@ File gid_File_Lib_Sal Name = STRING(CONCAT3(sal,UDK_MAJOR,.dll)); #endif Dir = gid_Dir_Program; - Styles = (PACKED,PATCH); + Styles = (PACKED, PATCH); End #ifdef MACOSX |