sb111: merged in to-the-side QA fixes

11 files changed, 74 insertions, 2136 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 88c1e02a7591..faa679409e22 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -50,20 +50,6 @@ 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,
@@ -100,12 +86,8 @@ 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_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_Share_Registry_Brand_Xcd,
              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,
@@ -148,9 +130,8 @@ Module gid_Module_Langpack_Brand_Template
              gid_Brand_File_License_License_Html,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
-             gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu,
-             gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu,
+             gid_Brand_File_Share_Registry_Cjk_Xcd,
+             gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
              gid_Brand_File_Txt_License_Html,
              gid_Brand_File_Txt_Readme,
@@ -253,71 +234,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";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Org
-    ParentID = gid_Brand_Dir_Share_Registry_Modules;
-    HostName = "org";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Inet
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Inet";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Office";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    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;
@@ -554,59 +470,28 @@ 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";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "brand.xcd";
 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";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu
+File gid_Brand_File_Share_Registry_Cjk_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (zh-CN) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
-    Name (zh-TW) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ja) = "cjk.xcd";
+    Name (ko) = "cjk.xcd";
+    Name (zh-CN) = "cjk.xcd";
+    Name (zh-TW) = "cjk.xcd";
 End
 
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu
+File gid_Brand_File_Share_Registry_Korea_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    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);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer;
-    Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-    Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu";
-    Name (zh-CN) = "/registry/spool/org/openoffice/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";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ko) = "korea.xcd";
 End
 
 #if defined UNX && ! defined MACOSX
@@ -1331,22 +1216,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 ce9fd987d038..f76433db3ffe 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -177,56 +177,6 @@ Directory gid_Dir_User
     DosName = "presets";
 End
 
-Directory gid_Dir_User_Registry
-    ParentID = gid_Dir_User;
-    DosName = "registry";
-End
-
-Directory gid_Dir_User_Registry_Data
-    ParentID = gid_Dir_User_Registry;
-    DosName = "data";
-End
-
-Directory gid_Dir_User_Registry_Data_Org
-    ParentID = gid_Dir_User_Registry_Data;
-    DosName = "org";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_User_Registry_Data_Org;
-    DosName = "openoffice";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "Office";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "UI";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "OOoImprovement";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Ucb
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "ucb";
-End
-
-Directory gid_Dir_User_Registry_Cache
-    ParentID = gid_Dir_User_Registry;
-    DosName = "cache";
-End
-
 Directory gid_Dir_User_Xslt
     ParentID = gid_Dir_User;
     DosName = "xslt";
@@ -727,256 +677,11 @@ 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";
-End
-
-Directory gid_Dir_Share_Registry_Data
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "data";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org
-    ParentID = gid_Dir_Share_Registry_Data;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Data_Org;
-    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";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Org
-    ParentID = gid_Dir_Share_Registry_Modules;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo
-    ParentID = gid_Dir_Share_Registry_Modules_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    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_Office_Accelerators
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Accelerators";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Paths";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Common";
-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 a49efd11958f..b249d22a9c8a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -36,25 +36,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)
 
@@ -84,41 +65,7 @@ File gid_File_Lib_Cached1
   #endif
 End
 
-File gid_File_Lib_Configmgr2
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX));
-  #else
-    Name = "configmgr2.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Sysmgr1
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX));
-  #else
-    Name = "sysmgr1.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Behelper
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX));
-  #else
-    Name = "behelper.uno.dll";
-  #endif
-End
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
@@ -278,12 +225,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)
@@ -451,12 +392,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);
@@ -475,12 +410,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);
@@ -499,12 +428,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)
 
@@ -534,12 +457,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
@@ -820,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);
@@ -965,17 +870,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)
 
@@ -1109,25 +1003,7 @@ 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);
-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 7d1d8bb5cc40..c5532e2ada32 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1158,969 +1158,25 @@ End
 
 #endif
 
-File gid_File_Oo_Inet_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/Inet.xcs";
-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
+File gid_File_Share_Registry_Main_Xcd
     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";
+    Dir = gid_Dir_Share_Registry;
+    Name = "main.xcd";
 End
 
-File gid_File_Oo_Office_Ui_Dbucommands_Xcu
+File gid_File_Oo_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ldap.xcd.sample";
 End
 
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcs
+File gid_File_Oo_Ad_Ldap_Xcd_Sample
     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);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/LDAP.xcu.sample";
-End
-
-File gid_File_Oo_Ldap_Attr_Map
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ldap-attr.map";
-End
-
-File gid_File_Oo_AD_Ldap_Attr_Map
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ad-ldap-attr.map";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ad-ldap.xcd.sample";
 End
 
 File gid_File_Rdb_Offapi
@@ -2149,141 +1205,43 @@ 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
+    Dir = gid_Dir_Share_Registry_Res;
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_chart_types.xcu";
+    EXTRA_ALL_LANG_BUT_EN_US(registry,xcd);
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu
-    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";
-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
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu);
+    Dir = gid_Dir_Share_Registry;
+    FILE_ALL_LANG_LETTER(Langpack-,xcd);
 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_Oo_Office_Paths_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths;
-#ifdef MACOSX
-    Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Registry_Spool_Oo_Common_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    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
+File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (pa-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ta-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ar) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (he) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (lo) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (dz) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (km) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (or) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (ne) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu";
-    Name (fa) = "/registry/spool/org/openoffice/Office/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);
+    Dir = gid_Dir_Share_Registry;
+    Name (th) = "ctl.xcd";
+    Name (hi-IN) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta-IN) = "ctl.xcd";
+    Name (gu-IN) = "ctl.xcd";
+    Name (ar) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
+    Name (dz) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (gu-IN) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (fa) = "ctl.xcd";
+    Name (my) = "ctl.xcd";
 End
 
 File gid_File_Scripts_Beanshell
@@ -2733,28 +1691,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;
@@ -2831,7 +1767,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
 
@@ -2931,25 +1867,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 9607c88b6e0c..06c3d73803e5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -173,12 +173,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,
@@ -272,16 +270,13 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Index_Data,
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
-	gid_File_Lib_Behelper,
-	gid_File_Lib_Configmgr2,
+	gid_File_Lib_Configmgr,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
-	gid_File_Lib_Sysmgr1,
 	gid_File_Lib_Adabas,
-	gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
 	gid_File_Lib_Db,
@@ -289,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,
@@ -315,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,
@@ -387,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,
@@ -637,150 +623,9 @@ Module gid_Module_Root_Files_6
 	gid_File_Mod_Style,
 	gid_File_Mod_Table,
 	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_Oo_Ldap_Xcd_Sample,
+    gid_File_Oo_Ad_Ldap_Xcd_Sample,
+    gid_File_Share_Registry_Main_Xcd,
 	gid_File_Pymailmerge,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
@@ -930,11 +775,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/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index d28fa5bb54dd..686a4ef719c8 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -47,10 +47,9 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Wordbook,
              gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
-             gid_File_Registry_Drivers_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
-             gid_File_Registry_Spool_Oo_Common_Ctl_Xcu,
+             gid_File_Share_Registry_Ctl_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 97211fe6a5ac..d61ab9d592d0 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -30,17 +30,6 @@
 
 #include "macros.inc"
 
-Profile gid_Profile_Configmgr_Ini
-    ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "configmgrrc";
-  #else
-    Name = "configmgr.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
 Profile gid_Profile_Uno_Ini
     ModuleID = gid_Module_Root;
   #ifdef UNX
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 69c771c83782..708ece95f6c5 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -30,262 +30,6 @@
 
 #include "macros.inc"
 
-// for the configmgr
-
-ProfileItem gid_Profileitem_Configmgr_Cfg_Servertype
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "CFG_ServerType";
-    Value = "uno";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Bootstrap_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "BootstrapFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap);
-End
-
-ProfileItem gid_Profileitem_Configmgr_Version_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "VersionFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(version);
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Uno_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UnoFile";
-  #ifdef UNX
-    Value = "$ORIGIN/unorc";
-  #else
-    Value = "$ORIGIN/uno.ini";
-  #endif
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Baseinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "BaseInstallation";
-    Value = "${OOO_BASE_DIR}";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Userinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "UserInstallation";
-    Value = "${$BootstrapFile:UserInstallation}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Schemaversion
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "CFG_SchemaVersion";
-    Value = "${$VersionFile:buildid}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "CFG_SchemaDataUrl";
-    Value = "$BaseInstallation/share/registry/schema ?$CFG_BrandLayerUrl/schema ?$CFG_UnoSharedPackages/schema ?$CFG_UnoUserPackages/schema";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "CFG_DefaultLayerUrls";
-    Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachedisposal
-    ProfileID =gid_Profile_Configmgr_Ini  ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 9;
-    Key  = "CFG_CacheDisposeDelay";
-    Value  = "900";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cacheinterval
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 10;
-    Key  = "CFG_CacheDisposeInterval";
-    Value  = "60";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachewrite
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 11;
-    Key  = "CFG_CacheWriteInterval";
-    Value  = "2";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Userdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 12;
-    Key  = "CFG_UserLayerUrl";
-    Value  = "$UserInstallation/user/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Cacheurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 13;
-    Key  = "CFG_CacheUrl";
-    Value  = "$UserInstallation/user/registry/cache";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultlayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 14;
-    Key  = "CFG_DefaultLayerUrl";
-    Value  = "$BaseInstallation/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Modulelayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 15;
-    Key  = "CFG_ModuleLayerUrl";
-    Value  = "$CFG_DefaultLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 16;
-    Key  = "CFG_UnoSharedPackages";
-    Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 17;
-    Key  = "CFG_UnoUserPackages";
-    Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 18;
-    Key  = "CFG_BrandLayerUrl";
-    Value  = "${BRAND_BASE_DIR}/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerModulesUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 19;
-    Key  = "CFG_BrandLayerModulesUrl";
-    Value  = "$CFG_BrandLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 20;
-    Key  = "CFG_BackendService";
-    Value  = "com.sun.star.comp.configuration.backend.MultiStratumBackend";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemasupplier
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 21;
-    Key  = "CFG_SchemaSupplier";
-    Value  = "com.sun.star.comp.configuration.backend.LocalSchemaSupplier";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Datasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 22;
-    Key  = "CFG_LocalDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Moduledatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 23;
-    Key  = "CFG_LocalModuleDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalMultiStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Resdatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 24;
-    Key  = "CFG_LocalResDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalResourceStratum";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Strata
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 25;
-    Key  = "CFG_Strata";
-    Value  = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_BrandLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_BrandLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 26;
-    Key  = "CFG_LdapMappingUrl";
-    Value  = "$BaseInstallation/share/registry/ldap";
-End
-
-//end configmgr
-
 ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
     ProfileID = gid_Profile_Setup_Ini;
     ModuleID = gid_Module_Root;