summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-04-26 13:27:14 +0000
committerKurt Zenker <kz@openoffice.org>2006-04-26 13:27:14 +0000
commitd6bc142f46b9ea5c2129524aa6c51ce9c0b9389d (patch)
treef40119219b28bfe229a2527a6ec8463e85b38830 /scp2
parent349a37a9bb24b93d7eb8ca7f17b4bee3dd16f00b (diff)
INTEGRATION: CWS fwk37 (1.195.8); FILE MERGED
2006/04/11 12:46:13 mav 1.195.8.2: #i45270# introduce passwordcontainer into the patch 2006/04/10 13:13:29 mav 1.195.8.1: #i59532# use new customaction for the patch
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 792fcd8fa328..ec3dd55772b0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
- * $Revision: 1.199 $
+ * $Revision: 1.200 $
*
- * last change: $Author: hr $ $Date: 2006-04-20 13:34:52 $
+ * last change: $Author: kz $ $Date: 2006-04-26 14:27:14 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1231,7 +1231,7 @@ File gid_File_Lib_Patchmsi
TXT_FILE_BODY;
Name = "patchmsi.dll";
Dir = gid_Dir_Program;
- Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY);
+ Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
#endif
@@ -1483,7 +1483,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Opc , opc)
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Package2,package2)
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pcr, pcr)