#i101955# consolidating xcs/xcu files in xcd files (for now in new postprocess/packregistry); extended configmgr2 to search for multiple xcd files per layer; removed some (relative, wrong) DOCTYPE SYSTEM paths from xcu files to avoid xsltproc warnings; extended scp2 EXTRA_ALL_LANG to work with extensions other than zip (i.e., xcd)

2 files changed, 4 insertions, 178 deletions

diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 96960dc6283a..000307175e8c 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -66,13 +66,6 @@ File gid_File_Exe_Sweb
 End
 #endif
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu";
-End
-
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -102,164 +95,10 @@ File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml
     Name = "/uiconfig/sglobal/menubar/menubar.xml";
 End
 */
-File gid_File_Oo_Office_Ui_Writercommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writercommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    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_Modules_Oo_TypeDetection_Types;
-    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_Modules_Oo_TypeDetection_Filter;
-    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_Modules_Oo_TypeDetection_Types;
-    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_Modules_Oo_TypeDetection_Filter;
-    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_Modules_Oo_TypeDetection_Types;
-    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_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_global_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-writer.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu";
-End
 
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcu
+File gid_File_Share_Registry_Writer_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "writer.xcd";
 End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu";
-End
-
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 6384bc28f3e3..ccf14081f452 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -60,21 +60,8 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,
-    gid_File_Oo_Office_Ui_Writercommands_Xcs,
-    gid_File_Oo_Office_Ui_Writercommands_Xcu,
-    gid_File_Registry_Spool_Oo_Common_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_Setup_Writer_Xcu,
+    gid_File_Share_Registry_Writer_Xcd,
     gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End