summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-05 16:45:56 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-05 16:45:56 +0000
commitbc8a5d2b959fb406a6de5bae2524fbaad82a01a8 (patch)
tree5054e40a60345a21dd5cf266878007a537feca97 /scp2
parent4fd1c772c08d39edb256cb3c032331a07e1d035c (diff)
INTEGRATION: CWS aquavcl05_DEV300 (1.227.16); FILE MERGED
2008/03/03 17:31:03 is 1.227.16.5: #i86640# desktop link and startmenu link 2008/02/14 16:50:35 pl 1.227.16.4: #i85963# backing component for QUARTZ after all 2008/02/14 15:57:28 pl 1.227.16.3: RESYNC: (1.227-1.228); FILE MERGED 2008/02/07 14:07:34 pl 1.227.16.2: #i67502# make StartModule optional 2008/01/29 19:01:19 pl 1.227.16.1: #i79755# add macosx specific configuration
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_ooo.scp21
1 files changed, 19 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 55282cae43ed..fd86472b9663 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: file_ooo.scp,v $
*
- * $Revision: 1.231 $
+ * $Revision: 1.232 $
*
- * last change: $Author: kz $ $Date: 2008-03-05 17:11:30 $
+ * last change: $Author: kz $ $Date: 2008-03-05 17:45:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -465,6 +465,16 @@ File gid_File_Bmp_IntroAbout
Styles = (ARCHIVE,PATCH);
End
+#ifdef WNT
+File gid_File_Desktophelper_Txt
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Program;
+ Name = "desktophelper.txt";
+ ComponentCondition = "CREATEDESKTOPLINK=1";
+End
+#endif
+
File gid_File_Dtd_Accelerator
TXT_FILE_BODY;
Styles = (PACKED);
@@ -2220,6 +2230,13 @@ File gid_File_Oo_Setup_Xcu
Name = "/registry/data/org/openoffice/Setup.xcu";
End
+File gid_File_Oo_Setup_Start_Xcu
+ TXT_FILE_BODY;
+ Styles = (PACKED, SCPZIP_REPLACE,PATCH);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
+ Name = "/registry/spool/org/openoffice/Setup-start.xcu";
+End
+
File gid_File_Oo_Firststartwizard_Xcs
TXT_FILE_BODY;
Styles = (PACKED);