CWS-TOOLING: integrate CWS oooimprovement3_DEV300

2009-02-26 16:28:11 +0100 jsk  r268533 : #i99197#
2009-02-26 15:03:06 +0100 jsk  r268524 : #i99197#
2009-02-26 15:00:34 +0100 jsk  r268522 : i99187#
2009-02-23 13:37:17 +0100 b_michaelsen  r268353 : #i99491# fixing OStringBuffer construction. thanks, tono
2009-02-18 17:31:06 +0100 b_michaelsen  r268247 : cleaned mixup between base and brand layer
2009-02-17 15:00:48 +0100 b_michaelsen  r268172 : fixed treeopt.cxx
2009-02-17 14:59:04 +0100 b_michaelsen  r268171 : catching all exceptions
2009-02-16 14:06:33 +0100 jsk  r267805 : #i99197#
2009-02-16 14:05:30 +0100 jsk  r267804 : #i99197#
2009-02-16 14:04:35 +0100 jsk  r267803 : #i99197#
2009-02-13 17:45:43 +0100 b_michaelsen  r267735 : #i98981# ensure logging of accelerators
2009-02-13 16:53:59 +0100 b_michaelsen  r267732 : #i98741# deploying usage tracking enabling xcu with BUILD SPECIAL
2009-02-13 16:52:40 +0100 b_michaelsen  r267731 : #i98741# delivering usage tracking enabling xcu
2009-02-13 16:43:55 +0100 b_michaelsen  r267730 : #i98981# adding abbrevation for accerators
2009-02-12 16:53:59 +0100 b_michaelsen  r267678 : #i98981# diasble logging of key events
2009-02-12 16:11:23 +0100 b_michaelsen  r267673 : #i98981# reliable way to toggle usage tracking
2009-02-12 16:10:13 +0100 b_michaelsen  r267672 : #i98981# reliable way to toggle usage tracking

4 files changed, 21 insertions, 7 deletions

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index ce137f9a0585..0a4e953920d8 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -907,6 +907,11 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic
     HostName = "Linguistic";
 End
 
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_Logging
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
+    HostName = "Logging";
+End
+
 Directory gid_Dir_Share_Registry_Modules_Oo_Office_Embedding
     ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
     HostName = "Embedding";
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index c692eb38c21d..93110fe693eb 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -31,10 +31,23 @@
 #include "macros.inc"
 
 #if defined(BUILD_SPECIAL)
-File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement
+File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs;
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Logging;
+    Name = "/registry/spool/org/openoffice/Office/Logging/Logging-oooimprovement.xcu";
+End
+#endif
+
+#if defined(BUILD_SPECIAL)
+File gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
     Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu";
 End
 #endif
+
+#if defined(BUILD_SPECIAL)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
+#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 91c48f7c34b1..1a76476049ee 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1705,10 +1705,6 @@ End
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
-#if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
-#endif
-
 #if defined WNT && \
     (defined M1310 || \
      ((defined M1400 || defined M1500) && \
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index 466df5968c28..b0485f7a0f73 100644
--- a/scp2/source/ooo/module_improvement.scp
+++ b/scp2/source/ooo/module_improvement.scp
@@ -40,6 +40,6 @@ Module gid_Module_Oooimprovement
     ParentID = gid_Module_Root;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Lib_Oooimprovement);
+    Files = (gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement);
 End
 #endif