summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 16:17:27 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 16:17:27 +0000
commit5fb8a40f3143c8dad9b4eddb0132dda1da4ff2ed (patch)
tree66ae8f579d7f5e4c4fc19e65e809132a13addb3d /scp2
parent85df6c064cea68a6b510a67d258387710a37a5ec (diff)
CWS-TOOLING: integrate CWS fwk116
2009-09-03 Mikhail Voytenko #i101453# write the default values for old entries 2009-09-03 Mikhail Voytenko #i101453# let the new default value be used 2009-09-03 Mikhail Voytenko #i101453# revert the change for xslt-transformation, the duplicate nodes should not be allowed 2009-09-03 Mikhail Voytenko #i101453# allow duplicate nodes for different modules 2009-09-03 Mikhail Voytenko #i101453# fix the special mac installation 2009-09-02 Mikhail Voytenko #i101453# correct the usage of configuration files 2009-09-02 Mikhail Voytenko #i10000# fix warning 2009-09-02 Mikhail Voytenko #i10000# fix warning 2009-09-02 Mikhail Voytenko #i96918# try to open the file for editing always 2009-09-02 Mikhail Voytenko #i51058# remove unused strings 2009-09-02 Mikhail Voytenko #i51058# remove unused strings 2009-09-01 Mikhail Voytenko #i10000# fix typo 2009-08-30 Mikhail Voytenko Rebase on DEV300_m56 2009-08-19 Mikhail Voytenko #i101732# do not generate a transparent bitmap for thumbnail 2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac 2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac 2009-08-07 Mikhail Voytenko #i103617# fix warning 2009-07-31 Carsten Driesner #i103924# Fix wrong number of arguments 2009-07-31 Mikhail Voytenko #i101207# integrate the patch 2009-07-31 Mikhail Voytenko #i103783# integrate the patch; get rid of CRLF 2009-07-31 Mikhail Voytenko #i97969# integrate the patch 2009-07-27 Carsten Driesner #i103423# Use correct request count in the ctor. Don't descrease value before checking the request count
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/directory_ooo.scp5
-rw-r--r--scp2/source/ooo/file_ooo.scp12
2 files changed, 16 insertions, 1 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index a6e2eba60361..62b569e8f730 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -902,6 +902,11 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
HostName = "Accelerators";
End
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths
+ ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
+ HostName = "Paths";
+End
+
Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
HostName = "Common";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 211a473c00aa..986e224f6a9e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1393,7 +1393,6 @@ File gid_File_Oo_Office_Extendedcolorscheme_Xcs
Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs";
End
-
File gid_File_Oo_Office_Paths_Xcs
TXT_FILE_BODY;
Styles = (PACKED);
@@ -2252,6 +2251,17 @@ File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu
#endif
End
+File gid_File_Oo_Office_Paths_System_Xcu
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths;
+#ifdef MACOSX
+ Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu";
+#else
+ Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu";
+#endif
+End
+
File gid_File_Registry_Spool_Oo_Common_System_Xcu
TXT_FILE_BODY;
Styles = (PACKED);