INTEGRATION: CWS fwkbugfix03 (1.6.32); FILE MERGED

2004/10/21 12:50:32 mav 1.6.32.2: #i35706# deliver xcu files
2004/10/19 05:48:57 as 1.6.32.1: #i35537# register filter directly as xcu files instead of using pkgchk

1 files changed, 47 insertions, 26 deletions

diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 730c1feee11a..4eaab5e360e5 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: file_writer.scp,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2004-11-09 11:55:48 $
+ *  last change: $Author: obo $ $Date: 2004-11-17 13:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,32 +108,11 @@ End
 
 #endif
 
-File gid_File_Oo_Office_Filter_Web_Pkg
+File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Uno_Packages;
-    Name = "fcfg_web.zip";
-End
-
-File gid_File_Oo_Office_Filter_Writer_Pkg
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Uno_Packages;
-    Name = "fcfg_writer.zip";
-End
-
-File gid_File_Oo_Office_Filter_Global_Pkg
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Uno_Packages;
-    Name = "fcfg_global.zip";
-End
-
-File gid_File_Oo_Office_Embedding_Writer_Pkg
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Uno_Packages;
-    Name = "embedding_writer.zip";
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/embedding_writer.xcu";
 End
 
 #ifdef SOLAR_JAVA
@@ -182,6 +161,48 @@ File gid_File_Oo_Office_Ui_Writercommands_Xcu
     Name = "/registry/data/org/openoffice/Office/UI/WriterCommands.xcu";
 End
 
+File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_writer_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_writer_filters.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_web_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_web_filters.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_global_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Spool;
+    Name = "/registry/spool/fcfg_global_filters.xcu";
+End
+
 File gid_File_Registry_Spool_Oo_Common_Writer_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);