summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2009-08-04 10:36:31 +0200
committersb <sb@openoffice.org>2009-08-04 10:36:31 +0200
commitd6d81df3a19561b448f40a329b3443faac74166c (patch)
treec110e96b457e4f18f29e396a99c1b0e4ad0a3a2d
parentebed0cbef9b919d5362d90d99e133de9a7da2ad5 (diff)
#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)
-rw-r--r--scp2/macros/macro.pl4
-rw-r--r--scp2/source/base/file_base.scp35
-rw-r--r--scp2/source/base/module_base.scp5
-rw-r--r--scp2/source/binfilter/file_binfilter.scp120
-rw-r--r--scp2/source/binfilter/module_binfilter.scp17
-rw-r--r--scp2/source/calc/file_calc.scp77
-rw-r--r--scp2/source/calc/module_calc.scp6
-rw-r--r--scp2/source/canvas/canvascommons.scp13
-rw-r--r--scp2/source/draw/file_draw.scp56
-rw-r--r--scp2/source/draw/module_draw.scp6
-rw-r--r--scp2/source/graphicfilter/file_graphicfilter.scp27
-rw-r--r--scp2/source/graphicfilter/module_graphicfilter.scp3
-rw-r--r--scp2/source/impress/file_impress.scp69
-rw-r--r--scp2/source/impress/module_impress.scp6
-rw-r--r--scp2/source/javafilter/file_javafilter.scp39
-rw-r--r--scp2/source/javafilter/module_javafilter.scp6
-rw-r--r--scp2/source/math/file_math.scp70
-rw-r--r--scp2/source/math/module_math.scp6
-rw-r--r--scp2/source/onlineupdate/file_onlineupdate.scp13
-rw-r--r--scp2/source/onlineupdate/module_onlineupdate.scp2
-rw-r--r--scp2/source/ooo/common_brand.scp86
-rw-r--r--scp2/source/ooo/directory_ooo.scp175
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp22
-rw-r--r--scp2/source/ooo/file_improvement.scp15
-rw-r--r--scp2/source/ooo/file_library_ooo.scp90
-rw-r--r--scp2/source/ooo/file_ooo.scp1085
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp158
-rw-r--r--scp2/source/ooo/module_improvement.scp2
-rw-r--r--scp2/source/python/file_python.scp6
-rw-r--r--scp2/source/python/module_python.scp2
-rw-r--r--scp2/source/writer/file_writer.scp167
-rw-r--r--scp2/source/writer/module_writer.scp15
-rw-r--r--scp2/source/xsltfilter/file_xsltfilter.scp13
-rw-r--r--scp2/source/xsltfilter/module_xsltfilter.scp3
34 files changed, 99 insertions, 2320 deletions
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 53bf047d9e98..43a00f4fe411 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -138,9 +138,9 @@ sub write_DIR_IDENT_ALL_LANG
sub write_EXTRA_ALL_LANG
{
- print OUTFILE "#define EXTRA_ALL_LANG(name) ";
+ print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
foreach $lang (@completelangiso) {
- print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+ print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
}
print OUTFILE "\n\n";
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index fa6c1cfcd661..397929e7c6e9 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -82,38 +82,9 @@ File gid_File_Help_Sdatabase_Zip
Patchfiles = ();
End
-File gid_File_Registry_Spool_Oo_Setup_Base_Xcu
+File gid_File_Share_Registry_Base_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-base.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "base.xcd";
End
-
-File gid_File_Registry_Spool_Oo_Common_Base_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-base.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_database_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_database_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
- Name = "/registry/spool/fcfg_database_others.xcu";
-End
-
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 27617b9d8eb5..d8b9d5f124a2 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -46,10 +46,7 @@ Module gid_Module_Prg_Base_Bin
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (
- gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu
- ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
- ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
- ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
+ gid_File_Share_Registry_Base_Xcd
,gid_File_Lib_Abp
,gid_File_Lib_Dbp
,gid_File_Lib_Dbu
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 7de57837fd0c..be7a0bf46613 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -31,127 +31,13 @@
#include "macros.inc"
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_chart_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_chart_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_calc_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu
+File gid_File_Share_Registry_Binfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_calc_bf_filters.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "binfilter.xcd";
End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_draw_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_draw_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_global_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_global_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_impress_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_impress_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_math_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_math_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_web_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_web_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_writer_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_writer_bf_filters.xcu";
-End
-
-
File gid_Starregistry_Legacy_Binfilters_Rdb
TXT_FILE_BODY;
Name = "legacy_binfilters.rdb";
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 41039a84281c..a889527c8f52 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -37,22 +37,7 @@ Module gid_Module_Optional_Binfilter
InstallOrder = "1100";
ParentID = gid_Module_Optional;
Default = YES;
- Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu,
+ Files = (gid_File_Share_Registry_Binfilter_Xcd,
gid_Starregistry_Legacy_Binfilters_Rdb,
gid_File_Lib_Bf_Go,
gid_File_Lib_Bf_Sch,
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 89096b80f87c..46c07cc0ed3a 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,12 +41,13 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
-File gid_File_Oo_Office_Dataaccess_Calc_Xcu
+File gid_File_Share_Registry_Calc_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/calc.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "calc.xcd";
End
+
STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
@@ -71,13 +72,6 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
STD_RES_FILE( gid_File_Res_Tfu, tfu )
-File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
- Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu";
-End
-
File gid_File_Help_Scalc_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY;
@@ -94,69 +88,6 @@ File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
Name = "/uiconfig/scalc/menubar/menubar.xml";
End
*/
-File gid_File_Oo_Office_Ui_Calccommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calccommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/CalcCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
- Name = "/registry/spool/org/openoffice/TypeDetection/UISort-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_calc_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_calc_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Calc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Calc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-calc.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu";
-End
-
File gid_File_Exe_Scalc
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 939b2cd81ac1..3ff1c73b0e3a 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -45,11 +45,9 @@ Module gid_Module_Prg_Calc_Bin
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+ Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
- gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
- gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
- gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+ gid_File_Tmp_Userinstall_Calc_Inf);
End
// Module gid_Module_Prg_Calc_Help
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 839cf429793c..b3a0d4505be5 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,19 +30,6 @@
#include "macros.inc"
-File gid_File_Oo_Office_Canvas_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Canvas.xcs";
-End
-File gid_File_Oo_Office_Canvas_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
-End
-
STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index b613f62ad97f..8d3a98efc12e 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -30,11 +30,11 @@
#include "macros.inc"
-File gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu
+File gid_File_Share_Registry_Draw_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
- Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "draw.xcd";
End
File gid_File_Help_Sdraw_Zip
@@ -65,53 +65,3 @@ File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml
Name = "/uiconfig/sdraw/menubar/menubar.xml";
End
*/
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
- Name = "/registry/spool/org/openoffice/TypeDetection/UISort-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_draw_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_draw_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Draw_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Draw_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-draw.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu";
-End
-
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index b5f8c89624a4..c77034ddea0b 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -46,10 +46,8 @@ Module gid_Module_Prg_Draw_Bin
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
- gid_File_Registry_Spool_Oo_Common_Draw_Xcu,gid_File_Registry_Spool_Oo_Setup_Draw_Xcu,
- gid_File_Oo_Office_Ui_Drawwindowstate_Xcs,gid_File_Oo_Office_Ui_Drawwindowstate_Xcu,
- gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu, gid_File_Tmp_Userinstall_Draw_Inf);
+ gid_File_Share_Registry_Draw_Xcd,
+ gid_File_Tmp_Userinstall_Draw_Inf);
End
// Module gid_Module_Prg_Draw_Help
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ea92bdac8c86..fbda826b5aa9 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -30,32 +30,11 @@
#include "macros.inc"
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu
+File gid_File_Share_Registry_Graphicfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_impressgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_impressgraphics_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_drawgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_drawgraphics_filters.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "graphicfilter.xcd";
End
STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index c55a253774ab..a1d85a724620 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -37,6 +37,5 @@ Module gid_Module_Optional_Grfflt
ParentID = gid_Module_Optional;
Default = YES;
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
- gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu);
+ gid_File_Share_Registry_Graphicfilter_Xcd);
End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 5b8475e8cc9f..a4867a9a6ce2 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -40,11 +40,11 @@ File gid_File_Lib_Animcore
PACKED_UNO_LIB_FILE_BODY;
End
-File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu
+File gid_File_Share_Registry_Impress_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
- Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "impress.xcd";
End
File gid_File_Help_Simpress_Zip
@@ -77,55 +77,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
End
*/
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
- Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_impress_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_impress_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Impress_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-impress.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu";
-End
-
// configuration files for custom animation effects
File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
@@ -141,17 +92,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
Name = "transitions.xml";
End
-
-File gid_File_Oo_Office_Ui_Effects_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Effects_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu";
-End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index dce65fe05170..95fc3e558cb7 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -46,11 +46,9 @@ Module gid_Module_Prg_Impress_Bin
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
- gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu,
- gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu,
+ gid_File_Share_Registry_Impress_Xcd,
gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
- gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf);
+ gid_File_Tmp_Userinstall_Impress_Inf);
End
// Module gid_Module_Prg_Impress_Help
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 01f68c9b3e4c..2f6a67286589 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -52,46 +52,25 @@ End
#endif
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu
+File gid_File_Share_Registry_Palm_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_palm_types.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "palm.xcd";
End
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu
+File gid_File_Share_Registry_Pocketexcel_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_palm_filters.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "pocketexcel.xcd";
End
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu
+File gid_File_Share_Registry_Pocketword_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_pocketword_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_pocketword_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_pocketexcel_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_pocketexcel_filters.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "pocketword.xcd";
End
#ifdef SOLAR_JAVA
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
index f256472a67de..980b1fb79023 100644
--- a/scp2/source/javafilter/module_javafilter.scp
+++ b/scp2/source/javafilter/module_javafilter.scp
@@ -63,7 +63,7 @@ End
Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
ParentID = gid_Module_Optional_Javafilter_Palm;
- Files = ( gid_File_Jar_Aportisdoc, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu );
+ Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
Sortkey = "100";
Minimal = NO;
Default = NO;
@@ -99,7 +99,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
ParentID = gid_Module_Optional_Javafilter_Pocketpc;
Sortkey = "100";
- Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
+ Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
Minimal = NO;
Default = NO;
Styles (en-US) = ();
@@ -114,7 +114,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
ParentID = gid_Module_Optional_Javafilter_Pocketpc;
Sortkey = "200";
- Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
+ Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
Minimal = NO;
Default = NO;
Styles (en-US) = ();
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 43436a75f82d..f30914be604a 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -46,11 +46,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
STD_RES_FILE( gid_File_Res_Sm, sm )
-File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
+File gid_File_Share_Registry_Math_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
- Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "math.xcd";
End
File gid_File_Help_Smath_Zip
@@ -81,67 +81,3 @@ File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml
Name = "/uiconfig/smath/menubar/menubar.xml";
End
*/
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/MathCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/MathCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
- Name = "/registry/spool/org/openoffice/TypeDetection/UISort-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_math_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_math_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Math_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Math_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-math.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/MathWindowState.xcu";
-End
-
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 08ab1725ed1e..1c63de29d50c 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -46,10 +46,8 @@ Module gid_Module_Prg_Math_Bin
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
- gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
- gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
- gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf);
+ gid_File_Share_Registry_Math_Xcd,
+ gid_File_Tmp_Userinstall_Math_Inf);
End
// Module gid_Module_Prg_Math_Help
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index b415ea2ad9e7..90453d701fe5 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -32,18 +32,11 @@
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno )
-File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
+File gid_File_Share_Registry_Onlineupdate_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Addons;
- Name = "/registry/spool/org/openoffice/Office/Addons/Addons-onlineupdate.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
- Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "draw.xcd";
End
#if defined LINUX || defined SOLARIS
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index cb6d6e267b98..124c6434c935 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -37,6 +37,6 @@ Module gid_Module_Optional_Onlineupdate
ParentID = gid_Module_Optional;
Default = YES;
Styles = (DONTSHOWINUSERINSTALL);
- Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate);
+ Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate);
Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs);
End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 920f5c5112fa..48c0edf29f0b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -50,20 +50,13 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages,
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
- gid_Brand_Dir_Share_Registry_Data,
- gid_Brand_Dir_Share_Registry_Data_Org,
- gid_Brand_Dir_Share_Registry_Data_Org_Openoffice,
- gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office,
gid_Brand_Dir_Share_Registry_Modules,
gid_Brand_Dir_Share_Registry_Modules_Org,
gid_Brand_Dir_Share_Registry_Modules_Oo,
gid_Brand_Dir_Share_Registry_Modules_Oo_Inet,
gid_Brand_Dir_Share_Registry_Modules_Oo_Office,
gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common,
- gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs,
- gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui,
gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer,
- gid_Brand_Dir_Share_Registry_Modules_Oo_Setup,
gid_Brand_Dir_Share_Xdg);
Files = (gid_Brand_File_BasisLink,
gid_Brand_File_Bin_Crashreport,
@@ -98,15 +91,11 @@ Module gid_Module_Root_Brand
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
- gid_Brand_File_Oo_Office_Compatibility_Xcu,
+ gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01,
- gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu,
- gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu,
- gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu,
gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01,
gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01,
gid_Brand_File_Script_Unopkg,
- gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration,
gid_Brand_File_Share_Xdg_Base,
gid_Brand_File_Share_Xdg_Calc,
gid_Brand_File_Share_Xdg_Draw,
@@ -254,26 +243,6 @@ Directory gid_Brand_Dir_Share_Registry
DosName = "registry";
End
-Directory gid_Brand_Dir_Share_Registry_Data
- ParentID = gid_Brand_Dir_Share_Registry;
- HostName = "data";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org
- ParentID = gid_Brand_Dir_Share_Registry_Data;
- HostName = "org";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice
- ParentID = gid_Brand_Dir_Share_Registry_Data_Org;
- HostName = "openoffice";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office
- ParentID = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice;
- HostName = "Office";
-End
-
Directory gid_Brand_Dir_Share_Registry_Modules
ParentID = gid_Brand_Dir_Share_Registry;
HostName = "modules";
@@ -304,21 +273,11 @@ Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common
HostName = "Common";
End
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui
- ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "UI";
-End
-
Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer
ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
HostName = "Writer";
End
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Setup
- ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
- HostName = "Setup";
-End
-
#if defined UNX && ! defined MACOSX
Directory gid_Brand_Dir_Share_Xdg
ParentID = gid_Brand_Dir_Share;
@@ -536,18 +495,11 @@ File gid_Brand_File_Images_Brand_Zip
Styles = (PACKED);
End
-File gid_Brand_File_Oo_Office_Compatibility_Xcu
+File gid_Brand_File_Share_Registry_Brand_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Compatibility.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-brand.xcu";
+ Dir = gid_Brand_Dir_Share_Registry;
+ Name = "brand.xcd";
End
File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu
@@ -567,13 +519,6 @@ File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu
Name (ko) = "/registry/spool/org/openoffice/Office/Common-korea.xcu";
End
-File gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui;
- Name = "/registry/spool/org/openoffice/Office/UI-brand.xcu";
-End
-
File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
@@ -584,13 +529,6 @@ File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu
Name (zh-TW) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
End
-File gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Setup;
- Name = "/registry/spool/org/openoffice/Setup-brand.xcu";
-End
-
#if defined UNX && ! defined MACOSX
File gid_Brand_File_Share_Xdg_Base
TXT_FILE_BODY;
@@ -1287,22 +1225,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
End
#endif
-#ifdef ENABLE_SVCTAGS
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs
- ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Jobs";
-End
-
-File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs;
- Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-registration.xcu";
-End
-
-#endif
-
//TODO: This actually belongs into a module of its own:
#if !defined SYSTEM_PYTHON
File gid_Brand_File_Bin_Python
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index a6e2eba60361..09ff80ffb932 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -727,51 +727,6 @@ Directory gid_Dir_Share_Registry
DosName = "registry";
End
-Directory gid_Dir_Share_Registry_Schema
- ParentID = gid_Dir_Share_Registry;
- HostName = "schema";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org
- ParentID = gid_Dir_Share_Registry_Schema;
- HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice
- ParentID = gid_Dir_Share_Registry_Schema_Org;
- HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- HostName = "OOoImprovement";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection
- ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- HostName = "TypeDetection";
-End
-
Directory gid_Dir_Share_Registry_Ldap
ParentID = gid_Dir_Share_Registry;
HostName = "ldap";
@@ -792,61 +747,11 @@ Directory gid_Dir_Share_Registry_Data_Org_Openoffice
HostName = "openoffice";
End
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office
- ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
- HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui
- ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess
- ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb
- ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
- HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection
- ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
- HostName = "TypeDetection";
-End
-
Directory gid_Dir_Share_Registry_Res
ParentID = gid_Dir_Share_Registry;
HostName = "res";
End
-Directory gid_Dir_Share_Registry_Res_Lang
- ParentID = gid_Dir_Share_Registry_Res;
- DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org
- ParentID = gid_Dir_Share_Registry_Res_Lang;
- HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice
- ParentID = gid_Dir_Share_Registry_Res_Lang_Org;
- HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Office
- ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
- HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Ucb
- ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
- HostName = "ucb";
-End
-
Directory gid_Dir_Share_Registry_Modules
ParentID = gid_Dir_Share_Registry;
HostName = "modules";
@@ -872,111 +777,31 @@ Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection
HostName = "TypeDetection";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort
- ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
- HostName = "UISort";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb
- ParentID = gid_Dir_Share_Registry_Modules_Oo;
- HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb;
- HostName = "Configuration";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_Setup
ParentID = gid_Dir_Share_Registry_Modules_Oo;
HostName = "Setup";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_Inet
- ParentID = gid_Dir_Share_Registry_Modules_Oo;
- HostName = "Inet";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Accelerators";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
HostName = "Common";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Writer
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Writer";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Impress
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Impress";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic
ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
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";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Scripting";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Addons";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Jobs
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "Jobs";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter
ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
HostName = "Filter";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter
- ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
- HostName = "GraphicFilter";
-End
-
Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types
ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
HostName = "Types";
End
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc
- ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
- HostName = "Misc";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
- HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers
- ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess;
- HostName = "Drivers";
-End
-
Directory gid_Dir_Autotext
ParentID = gid_Dir_Share;
DosName = "autotext";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index b2789c3087d7..9ac8384e360e 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -41,7 +41,7 @@ File gid_File_Extra_Autotextshare_Lang
Dir = gid_Dir_Autotext_Language;
USER_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(autotextshare);
+ EXTRA_ALL_LANG(autotextshare,zip);
End
File gid_File_Extra_Autotextuser
@@ -308,7 +308,7 @@ File gid_File_Extra_Palettes_Lang
Dir = gid_Dir_User_Config;
USER_FILE_BODY;
Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
- EXTRA_ALL_LANG(palettes);
+ EXTRA_ALL_LANG(palettes,zip);
End
File gid_File_Extra_Poll_Asp
@@ -357,14 +357,14 @@ File gid_File_Extra_Tpllayoutimpr_Lang
Dir = gid_Dir_Template_Layout;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tpllayoutimpr);
+ EXTRA_ALL_LANG(tpllayoutimpr,zip);
End
File gid_File_Extra_Tplpresntimpr_Lang
Dir = gid_Dir_Template_Presnt;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplpresntimpr);
+ EXTRA_ALL_LANG(tplpresntimpr,zip);
End
File gid_File_Extra_Tplwizbitmap
@@ -378,7 +378,7 @@ File gid_File_Extra_Tplwizdesktop_Lang
Dir = gid_Dir_Template_Internal;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplwizdesktop);
+ EXTRA_ALL_LANG(tplwizdesktop,zip);
End
File gid_File_Extra_Tplwizletter
@@ -390,35 +390,35 @@ End
File gid_File_Extra_Tplwizletter_Lang
Dir = gid_Dir_Template_Wizard_Letter;
ARCHIVE_TXT_FILE_BODY;
- EXTRA_ALL_LANG(tplwizletter);
+ EXTRA_ALL_LANG(tplwizletter,zip);
End
File gid_File_Extra_Tplwizfax_Lang
Dir = gid_Dir_Template_Wizard_Fax;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplwizfax);
+ EXTRA_ALL_LANG(tplwizfax,zip);
End
File gid_File_Extra_Tplwizagenda_Lang
Dir = gid_Dir_Template_Wizard_Agenda;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplwizagenda);
+ EXTRA_ALL_LANG(tplwizagenda,zip);
End
File gid_File_Extra_Tplwizreport_Lang
Dir = gid_Dir_Template_Wizard_Report;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplwizreport);
+ EXTRA_ALL_LANG(tplwizreport,zip);
End
File gid_File_Extra_Tplwizstyles_Lang
Dir = gid_Dir_Template_Wizard_Styles;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tplwizstyles);
+ EXTRA_ALL_LANG(tplwizstyles,zip);
End
File gid_File_Extra_Webcast_Asp
@@ -444,5 +444,5 @@ File gid_File_Extra_Wordbook_Lang
Dir = gid_Dir_Wordbook_Language;
TXT_FILE_BODY;
Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(wordbook);
+ EXTRA_ALL_LANG(wordbook,zip);
End
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 93110fe693eb..e81f7d63dd2c 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -31,20 +31,11 @@
#include "macros.inc"
#if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement
+File gid_File_Share_Registry_Oooimprovement_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- 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";
+ Dir = gid_Dir_Share_Registry;
+ Name = "oooimprovement.xcd";
End
#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d7493d4c5bc4..39e523b8dd6f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -37,25 +37,6 @@ File gid_File_Lib_Accessbridge
Name = "java_uno_accessbridge.dll";
End
#endif
-#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
-File gid_File_Oo_Office_Dataaccess_Adabas_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/adabas.xcu";
-End
-#endif
-
-#if defined(WNT)
-STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
-File gid_File_Oo_Office_Dataaccess_Ado_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/ado.xcu";
-End
-#endif
STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
@@ -245,12 +226,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
-File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/dbase.xcu";
-End
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -418,12 +393,6 @@ End
#ifdef UNX
#ifdef ENABLE_KAB
-File gid_File_Oo_Office_Dataaccess_Kab_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/kab.xcu";
-End
File gid_File_Lib_Kab_1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
@@ -442,12 +411,6 @@ End
#endif
#ifdef MACOSX
-File gid_File_Oo_Office_Dataaccess_Macab_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/macab.xcu";
-End
File gid_File_Lib_Macab_1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
@@ -466,12 +429,6 @@ End
#endif // #ifdef ENABLE_KAB
#ifdef ENABLE_EVOAB2
-File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/evoab2.xcu";
-End
STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
@@ -501,12 +458,6 @@ File gid_File_Lib_Filterconfig1
Name = SPECIAL_NAME(filterconfig1);
End
-File gid_File_Oo_Office_Dataaccess_Flat_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/flat.xcu";
-End
STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
#ifdef WNT
@@ -786,22 +737,10 @@ End
#ifdef SOLAR_JAVA
STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/jdbc.xcu";
-End
#endif
#ifdef SOLAR_JAVA
-File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/hsqldb.xcu";
-End
File gid_File_Lib_Hsqldb_2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
@@ -920,17 +859,6 @@ End
#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
// #i91209#
-File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-#ifdef WNT
- Name = "/registry/spool/DataAccess/mozab.xcu";
-#else
- Name = "/registry/spool/DataAccess/mozab2.xcu";
-#endif
-End
-
STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
@@ -1038,24 +966,12 @@ End
#endif
STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
-File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/mysql.xcu";
-End
STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
-File gid_File_Oo_Office_Dataaccess_Odbc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
- Name = "/registry/spool/DataAccess/odbc.xcu";
-End
File gid_File_Registry_Drivers_Zip
- Dir = gid_Dir_Share_Registry_Res_Lang;
- ARCHIVE_TXT_FILE_BODY;
- EXTRA_ALL_LANG(fcfg_drivers);
+ Dir = gid_Dir_Share_Registry_Res;
+ TXT_FILE_BODY;
+ EXTRA_ALL_LANG(fcfg_drivers,xcd);
End
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5ddbbe70b70f..cf14a1efc0b2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1175,951 +1175,13 @@ End
#endif
-File gid_File_Oo_Inet_Xcs
+File gid_File_Share_Registry_Main_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/Inet.xcs";
+ Dir = gid_Dir_Share_Registry;
+ Name = "main.xcd";
End
-File gid_File_Oo_Inet_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
- Name = "/registry/data/org/openoffice/Inet.xcu";
-End
-
-File gid_File_Oo_Office_Addons_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Addons.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Windowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/WindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs";
-End
-
-/*
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/BibliographyWindowState.xcu";
-End
-*/
-File gid_File_Oo_Office_Calc_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Calc.xcs";
-End
-
-File gid_File_Oo_Office_Calc_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Calc.xcu";
-End
-
-File gid_File_Oo_Office_CalcAddIns_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/CalcAddIns.xcs";
-End
-
-File gid_File_Oo_Office_Chart_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Chart.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/ChartCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Commands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Commands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Category_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/Category.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/GenericCategories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Common.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Histories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_WindowContentFactories_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs";
-End
-
-File gid_File_Oo_Office_Extendedcolorscheme_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs";
-End
-
-
-File gid_File_Oo_Office_Paths_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Paths.xcs";
-End
-
-File gid_File_Oo_Office_Logging_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Logging.xcs";
-End
-
-File gid_File_Oo_Office_OOoImprovement_Settings_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement;
- Name = "/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs";
-End
-
-File gid_File_Oo_Office_OptionsDialog_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/OptionsDialog.xcs";
-End
-
-File gid_File_Oo_Office_Recovery_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Recovery.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Histories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED,SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Common.xcu";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Accelerators.xcs";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Accelerators.xcu";
-End
-
-File gid_File_Oo_Office_Paths_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Paths.xcu";
-End
-
-File gid_File_Oo_Office_Logging_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Logging.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Views.xcu";
-End
-
-File gid_File_Oo_Office_Compatibility_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Compatibility.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/Controller.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/Controller.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/DataAccess.xcs";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/DataAccess.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Drivers_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess;
- Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Draw_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Draw.xcs";
-End
-
-File gid_File_Oo_Office_Events_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Events.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/ExtensionManager.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/ExtensionManager.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/Factories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/Factories.xcu";
-End
-
-File gid_File_Oo_Office_Embedding_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Embedding.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
- Name = "/registry/spool/org/openoffice/Office/Embedding-chart.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_GlobalSettings_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Impress.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Impress.xcu";
-End
-
-File gid_File_Oo_Office_Java_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Java.xcs";
-End
-
-File gid_File_Oo_Office_Jobs_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Jobs.xcs";
-End
-
-File gid_File_Oo_Office_Jobs_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Jobs.xcu";
-End
-
-File gid_File_Oo_Office_Labels_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Labels.xcs";
-End
-
-File gid_File_Oo_Office_Labels_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Labels.xcu";
-End
-
-File gid_File_Oo_Office_Linguistic_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Math.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Math.xcu";
-End
-
-File gid_File_Oo_Office_TabBrowse_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/TabBrowse.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/ProtocolHandler.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/ProtocolHandler.xcu";
-End
-
-File gid_File_Oo_Office_Scripting_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Scripting.xcs";
-End
-
-File gid_File_Oo_Office_Scripting_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Scripting.xcu";
-End
-
-File gid_File_Oo_Office_Security_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Security.xcs";
-End
-
-File gid_File_Oo_Office_Security_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Security.xcu";
-End
-
-File gid_File_Oo_Office_Sfx_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/SFX.xcs";
-End
-
-File gid_File_Oo_Office_Sfx_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/SFX.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
- Name = "/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
- Name = "/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Substitution_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Substitution.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/UI.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/UI.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Views.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Writer.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/Writer.xcu";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/WebWizard.xcs";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/WebWizard.xcu";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/FormWizard.xcs";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/FormWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_TableWizard_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/TableWizard.xcs";
-End
-
-File gid_File_Oo_Office_TableWizard_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
- Name = "/registry/data/org/openoffice/Office/TableWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_Writerweb_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/WriterWeb.xcs";
-End
-
-File gid_File_Oo_Office_TypeDetection_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/TypeDetection.xcs";
-End
-
-File gid_File_Oo_Office_Embedding_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
- Name = "/registry/schema/org/openoffice/Office/Embedding.xcs";
-End
-
-File gid_File_Oo_Setup_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/Setup.xcs";
-End
-
-File gid_File_Oo_Setup_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
- Name = "/registry/data/org/openoffice/Setup.xcu";
-End
-
-File gid_File_Oo_Setup_Start_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- 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);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/FirstStartWizard.xcs";
-End
-
-File gid_File_Oo_Firststartwizard_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
- Name = "/registry/data/org/openoffice/FirstStartWizard.xcu";
-End
-
-File gid_File_Oo_System_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/System.xcs";
-End
-
-File gid_File_Oo_Typedetection_Filter_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
- Name = "/registry/schema/org/openoffice/TypeDetection/Filter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Graphicfilter_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
- Name = "/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Misc_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
- Name = "/registry/schema/org/openoffice/TypeDetection/Misc.xcs";
-End
-
-File gid_File_Oo_Typedetection_Types_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
- Name = "/registry/schema/org/openoffice/TypeDetection/Types.xcs";
-End
-
-File gid_File_Oo_Typedetection_UISort_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
- Name = "/registry/schema/org/openoffice/TypeDetection/UISort.xcs";
-End
-
-File gid_File_Oo_TypeDetection_UISort_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection;
- Name = "/registry/data/org/openoffice/TypeDetection/UISort.xcu";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
- Name = "/registry/schema/org/openoffice/ucb/Configuration.xcs";
-End
-
-File gid_File_Oo_Ucb_InteractionHandler_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
- Name = "/registry/schema/org/openoffice/ucb/InteractionHandler.xcs";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb;
- Name = "/registry/data/org/openoffice/ucb/Configuration.xcu";
-End
-
-File gid_File_Oo_Ucb_Hierarchy_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
- Name = "/registry/schema/org/openoffice/ucb/Hierarchy.xcs";
-End
-
-File gid_File_Oo_Ucb_Store_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
- Name = "/registry/schema/org/openoffice/ucb/Store.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/UserProfile.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
- Name = "/registry/data/org/openoffice/UserProfile.xcu";
-End
-
-File gid_File_Oo_Vcl_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/VCL.xcs";
-End
-
-File gid_File_Oo_Vcl_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
- Name = "/registry/data/org/openoffice/VCL.xcu";
-End
-
-File gid_File_Oo_Ldap_Xcs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
- Name = "/registry/schema/org/openoffice/LDAP.xcs";
-End
-
-
File gid_File_Oo_Ldap_Xcu
TXT_FILE_BODY;
Styles = (PACKED);
@@ -2167,71 +1229,15 @@ End
#endif
File gid_File_Registry_Lang
- Dir = gid_Dir_Share_Registry_Res_Lang;
- ARCHIVE_TXT_FILE_BODY;
- EXTRA_ALL_LANG(registry);
-End
-
-File gid_File_Registry_Filter_Zip
- Dir = gid_Dir_Share_Registry_Res_Lang;
- ARCHIVE_TXT_FILE_BODY;
- EXTRA_ALL_LANG(fcfg_langpack);
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_base_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_base_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
- Name = "/registry/spool/fcfg_base_others.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_chart_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu
+ Dir = gid_Dir_Share_Registry_Res;
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_chart_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
- Name = "/registry/spool/fcfg_chart_others.xcu";
+ EXTRA_ALL_LANG(registry,xcd);
End
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu
+File gid_File_Registry_Filter_Zip
+ Dir = gid_Dir_Share_Registry_Res;
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_internalgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter;
- Name = "/registry/spool/fcfg_internalgraphics_filters.xcu";
+ EXTRA_ALL_LANG(fcfg_langpack,xcd);
End
File gid_File_Registry_Spool_Langpack_Lang
@@ -2241,30 +1247,6 @@ File gid_File_Registry_Spool_Langpack_Lang
FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu);
End
-File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators;
-#ifdef QUARTZ
- Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu";
-#else
- Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Registry_Spool_Oo_Common_System_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-#ifdef WNT
- Name = "/registry/spool/org/openoffice/Office/Common-wnt.xcu";
-#elif defined QUARTZ
- Name = "/registry/spool/org/openoffice/Office/Common-macosx.xcu";
-#else
- Name = "/registry/spool/org/openoffice/Office/Common-unx.xcu";
-#endif
-End
-
File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
@@ -2286,13 +1268,6 @@ File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu
Name (my) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
End
-File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer;
- Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
- Styles = (PACKED);
-End
-
File gid_File_Scripts_Beanshell
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
@@ -2736,28 +1711,6 @@ File gid_Starregistry_Services_Rdb
JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
End
-#if defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
- Name = "/registry/spool/org/openoffice/Office/Common-UseOOoFileDialogs.xcu";
- Styles = (PACKED,SCPZIP_REPLACE);
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
- Name = "/registry/spool/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu";
- Styles = (PACKED,SCPZIP_REPLACE,SET_OFFICE_LANGUAGE);
-End
-
-#endif
-
#ifdef LINUX
File gid_File_Dat_Root3
TXT_FILE_BODY;
@@ -2834,7 +1787,7 @@ File gid_File_InfoPlist_Lang
Dir = gid_Dir_Bundle_Contents_Resources_Lang;
ARCHIVE_TXT_FILE_BODY;
Styles = (ARCHIVE);
- EXTRA_ALL_LANG(InfoPlist);
+ EXTRA_ALL_LANG(InfoPlist,zip);
End
#endif
@@ -2934,25 +1887,11 @@ File gid_File_ImagesClassic8_Zip
Styles = (PACKED);
End
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
- Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
- Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu
+File gid_File_Share_Registry_Lingucomponent_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
- Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "lingucomponent.xcd";
End
// Dictionary extensions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 991615d72d46..0c7b8fe2b6dc 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -174,12 +174,10 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Dba,
gid_File_Lib_Dbacfg,
gid_File_Lib_Dbase2,
- gid_File_Oo_Office_Dataaccess_Dbase_Xcu,
gid_File_Lib_Dbaxml,
gid_File_Lib_Dbt,
gid_File_Lib_Dbfile,
gid_File_Lib_Drawinglayer,
- gid_File_Oo_Office_Dataaccess_Flat_Xcu,
gid_File_Lib_Flat,
gid_File_Lib_For,
gid_File_Lib_Forui,
@@ -279,7 +277,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ldapbe2,
gid_File_Lib_Comphelper2,
gid_File_Lib_Adabas,
- gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
gid_File_Lib_Cached1,
gid_File_Lib_Curl,
gid_File_Lib_Db,
@@ -287,11 +284,8 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
gid_File_Lib_Evoab_2,
- gid_File_Oo_Office_Dataaccess_Evoab_Xcu,
gid_File_Lib_Kab_1,
- gid_File_Oo_Office_Dataaccess_Kab_Xcu,
gid_File_Lib_Kab_Drv_1,
- gid_File_Oo_Office_Dataaccess_Macab_Xcu,
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Evtatt,
@@ -313,19 +307,14 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Localedata_Es,
gid_File_Lib_Localedata_Euro,
gid_File_Lib_Localedata_Others,
- gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu,
gid_File_Lib_Hsqldb_2,
gid_File_Lib_Jdbc,
- gid_File_Oo_Office_Dataaccess_Jdbc_Xcu,
gid_File_Lib_Mcnttype,
- gid_File_Oo_Office_Dataaccess_Mozab_Xcu,
gid_File_Lib_Mozab_2,
gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap,
gid_File_Lib_Mysql,
- gid_File_Oo_Office_Dataaccess_Mysql_Xcu,
gid_File_Lib_Odbc,
- gid_File_Oo_Office_Dataaccess_Odbc_Xcu,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
gid_File_Lib_Package2,
@@ -385,7 +374,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Stdc_5,
gid_File_Lib_Accessbridge,
gid_File_Lib_Ado,
- gid_File_Oo_Office_Dataaccess_Ado_Xcu,
gid_File_Lib_Dl,
gid_File_Lib_Dnd,
gid_File_Lib_Dtrans,
@@ -639,148 +627,8 @@ Module gid_Module_Root_Files_6
gid_File_Mod_Text,
gid_File_Oo_Ldap_Attr_Map,
gid_File_Oo_AD_Ldap_Attr_Map,
- gid_File_Oo_Inet_Xcs,
- gid_File_Oo_Inet_Xcu,
- gid_File_Oo_Office_Addons_Xcs,
- gid_File_Oo_Office_OOoImprovement_Settings_Xcs,
- gid_File_Oo_Office_Ui_Basicidecommands_Xcs,
- gid_File_Oo_Office_Ui_Basicidecommands_Xcu,
- gid_File_Oo_Office_Ui_Windowstate_Xcs,
- gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs,
- gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu,
- gid_File_Oo_Office_Ui_Bibliographycommands_Xcs,
- gid_File_Oo_Office_Ui_Bibliographycommands_Xcu,
- gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs,
- gid_File_Oo_Office_Calc_Xcs,
- gid_File_Oo_Office_Calc_Xcu,
- gid_File_Oo_Office_CalcAddIns_Xcs,
- gid_File_Oo_Office_Chart_Xcs,
- gid_File_Oo_Office_Ui_Chartcommands_Xcs,
- gid_File_Oo_Office_Ui_Chartcommands_Xcu,
- gid_File_Oo_Office_Ui_Chartwindowstate_Xcs,
- gid_File_Oo_Office_Ui_Chartwindowstate_Xcu,
- gid_File_Oo_Office_Commands_Xcs,
- gid_File_Oo_Office_Ui_Commands_Xcs,
- gid_File_Oo_Office_Ui_Category_Xcs,
- gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs,
- gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu,
- gid_File_Oo_Office_Ui_Genericcategories_Xcs,
- gid_File_Oo_Office_Ui_Genericcategories_Xcu,
- gid_File_Oo_Office_Common_Xcs,
- gid_File_Oo_Office_Common_Xcu,
- gid_File_Oo_Office_Extendedcolorscheme_Xcs,
- gid_File_Oo_Office_OptionsDialog_Xcs,
- gid_File_Oo_Office_Recovery_Xcs,
- gid_File_Oo_Office_Compatibility_Xcs,
- gid_File_Oo_Office_Ui_Controller_Xcs,
- gid_File_Oo_Office_Ui_Controller_Xcu,
- gid_File_Oo_Office_Dataaccess_Xcs,
- gid_File_Oo_Office_Dataaccess_Xcu,
- gid_File_Oo_Office_Dataaccess_Drivers_Xcs,
- gid_File_Oo_Office_Ui_Dbucommands_Xcs,
- gid_File_Oo_Office_Ui_Dbucommands_Xcu,
- gid_File_Oo_Office_Ui_Basewindowstate_Xcs,
- gid_File_Oo_Office_Ui_Basewindowstate_Xcu,
- gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs,
- gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu,
- gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs,
- gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu,
- gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs,
- gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu,
- gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs,
- gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu,
- gid_File_Oo_Office_Draw_Xcs,
- gid_File_Oo_Office_Events_Xcs,
- gid_File_Oo_Office_ExtensionManager_Xcs,
- gid_File_Oo_Office_ExtensionManager_Xcu,
- gid_File_Oo_Office_Ui_Factories_Xcs,
- gid_File_Oo_Office_Ui_Factories_Xcu,
- gid_File_Oo_Office_Embedding_Xcu,
- gid_File_Oo_Office_Ui_Genericcommands_Xcs,
- gid_File_Oo_Office_Ui_Genericcommands_Xcu,
- gid_File_Oo_Office_Ui_GlobalSettings_Xcs,
- gid_File_Oo_Office_Impress_Xcs,
- gid_File_Oo_Office_Impress_Xcu,
- gid_File_Oo_Office_Java_Xcs,
- gid_File_Oo_Office_Jobs_Xcs,
- gid_File_Oo_Office_Jobs_Xcu,
- gid_File_Oo_Office_Labels_Xcs,
- gid_File_Oo_Office_Labels_Xcu,
- gid_File_Oo_Office_Linguistic_Xcs,
- gid_File_Oo_Office_Math_Xcs,
- gid_File_Oo_Office_Math_Xcu,
- gid_File_Oo_Office_Protocolhandler_Xcs,
- gid_File_Oo_Office_Protocolhandler_Xcu,
- gid_File_Oo_Office_Scripting_Xcs,
- gid_File_Oo_Office_Scripting_Xcu,
- gid_File_Oo_Office_Security_Xcs,
- gid_File_Oo_Office_Security_Xcu,
- gid_File_Oo_Office_Sfx_Xcs,
- gid_File_Oo_Office_Sfx_Xcu,
- gid_File_Oo_Office_Ui_Startmodulecommands_Xcs,
- gid_File_Oo_Office_Ui_Startmodulecommands_Xcu,
- gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs,
- gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu,
- gid_File_Oo_Office_Substitution_Xcs,
- gid_File_Oo_Office_Ui_Xcs,
- gid_File_Oo_Office_Ui_Xcu,
- gid_File_Oo_Office_Views_Xcs,
- gid_File_Oo_Office_Writer_Xcs,
- gid_File_Oo_Office_Writer_Xcu,
- gid_File_Oo_Office_WebWizard_Xcs,
- gid_File_Oo_Office_WebWizard_Xcu,
- gid_File_Oo_Office_FormWizard_Xcs,
- gid_File_Oo_Office_FormWizard_Xcu,
- gid_File_Oo_Office_TableWizard_Xcs,
- gid_File_Oo_Office_TableWizard_Xcu,
- gid_File_Oo_Office_Writerweb_Xcs,
- gid_File_Oo_Office_TypeDetection_Xcs,
- gid_File_Oo_Office_Embedding_Xcs,
- gid_File_Oo_Setup_Xcs,
- gid_File_Oo_Setup_Xcu,
- gid_File_Oo_Setup_Start_Xcu,
- gid_File_Oo_Firststartwizard_Xcs,
- gid_File_Oo_Firststartwizard_Xcu,
- gid_File_Oo_System_Xcs,
- gid_File_Oo_Typedetection_Filter_Xcs,
- gid_File_Oo_Typedetection_Graphicfilter_Xcs,
- gid_File_Oo_Typedetection_Misc_Xcs,
- gid_File_Oo_Typedetection_Types_Xcs,
- gid_File_Oo_Ucb_Configuration_Xcs,
- gid_File_Oo_Ucb_Configuration_Xcu,
- gid_File_Oo_Ucb_InteractionHandler_Xcs,
- gid_File_Oo_Ucb_Hierarchy_Xcs,
- gid_File_Oo_Ucb_Store_Xcs,
- gid_File_Oo_Userprofile_Xcs,
- gid_File_Oo_Userprofile_Xcu,
- gid_File_Oo_Vcl_Xcs,
- gid_File_Oo_Vcl_Xcu,
- gid_File_Oo_Ldap_Xcs,
gid_File_Oo_Ldap_Xcu,
- gid_File_Oo_Typedetection_UISort_Xcs,
- gid_File_Oo_Office_Ui_Mathwindowstate_Xcs,
- gid_File_Oo_Office_Views_Xcu,
- gid_File_Oo_TypeDetection_UISort_Xcu,
- gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu,
- gid_File_Registry_Spool_Oo_Common_System_Xcu,
- gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu,
- gid_File_Registry_Spool_Oo_Dataaccess_Adabasdriver_Xcu,
- gid_File_Registry_Spool_Oo_Writer_javamail_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu,
- gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu,
- gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu,
+ gid_File_Share_Registry_Main_Xcd,
gid_File_Pymailmerge,
gid_File_Xsl_Common_Measure_Conversion,
gid_File_Xsl_Common_Math_Functions,
@@ -930,11 +778,9 @@ Module gid_Module_Oo_Linguistic
Styles = (HIDDEN_ROOT);
Files = (gid_File_Lib_Spell,
gid_File_Lib_Hunspell,
- gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu,
gid_File_Lib_Hyph,
- gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu,
gid_File_Lib_Lnth,
- gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu);
+ gid_File_Share_Registry_Lingucomponent_Xcd);
End
#ifdef LINUX
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index b0485f7a0f73..9bacce07fe90 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_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement);
+ Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement);
End
#endif
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 403e6385dcfd..4924c7ca799d 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -120,11 +120,11 @@ End
// Scripting Framework Python configuration settings
-File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu
+File gid_File_Share_Registry_Pyuno_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Scripting;
- Name = "/registry/spool/org/openoffice/Office/Scripting-python.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "pyuno.xcd";
End
#ifndef SYSTEM_PYTHON
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index a3e7611dc56f..e0b11a9ead4d 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -35,7 +35,7 @@ Module gid_Module_Optional_Pyuno
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
ParentID = gid_Module_Optional;
Sortkey = "750";
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu);
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
Minimal = NO;
Default = YES;
Styles = ( );
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
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index c85dde29958c..fc15a6437615 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -30,18 +30,11 @@
#include "macros.inc"
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu
+File gid_File_Share_Registry_Xsltfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
- Name = "/registry/spool/fcfg_xslt_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
- Name = "/registry/spool/fcfg_xslt_filters.xcu";
+ Dir = gid_Dir_Share_Registry;
+ Name = "xsltfilter.xcd";
End
File gid_File_Stw_Docbooktemplate
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7432e169d909..f5bc2acc6482 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Xsltfiltersamples
gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
gid_File_Xsl_Export_Xhtml_Table,
- gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu,
- gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu );
+ gid_File_Share_Registry_Xsltfilter_Xcd );
Minimal = NO;
Default = NO;
Styles = ( );