Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (500 commits)
masterfix DEV300: #i10000# remove hard dep
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i100000# dep. fix
masterfix DEV300: #i10000# removed one hard dep
masterfix DEV300: #i10000# fixed patch handling
masterfix DEV300: #i10000# new configure
DEV300
masterfix DEV300: #i10000# nawk -> awk
l10nmove: adjust repository handling
l10nmove: fixed regex
l10nmove: minor fixes
l10nmove: add l10n repo to gb_REPOS
DEV300 masterfix: gnumake3: subsequenttests requires  in environment
ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
DEV300 masterfix: #i10000#: windows: more bizare hacks ...
locales34: have a matching configure as well
DEV300
locales34: back out change from autoreconf
gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
...

Conflicts:
configure
configure.in
instsetoo_native/prj/build.lst
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
instsetoo_native/util/pack.lst
ooo.lst
scp2/source/canvas/canvascommons.scp
scp2/source/canvas/mtfrenderer.scp
scp2/source/ooo/common_brand.scp
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/file_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
scp2/source/ooo/module_langpack.ulf
scp2/source/ooo/ure.scp
scp2/source/python/file_python.scp
scp2/source/sdkoo/sdkoo.scp
scp2/source/templates/module_langpack_accessories_templates.sct
scp2/source/templates/module_langpack_accessories_templates_root.sct
set_soenv.in
soldep/bootstrp/appdef.cxx
soldep/bootstrp/dep.cxx
soldep/bootstrp/hashtbl.cxx
soldep/bootstrp/makefile.mk
soldep/bootstrp/minormk.cxx
soldep/bootstrp/prj.cxx
soldep/bootstrp/prodmap.cxx
soldep/inc/dep.hxx
soldep/inc/minormk.hxx
soldep/inc/prodmap.hxx
soldep/inc/soldep/appdef.hxx
soldep/inc/soldep/connctr.hxx
soldep/inc/soldep/depper.hxx
soldep/inc/soldep/depwin.hxx
soldep/inc/soldep/hashtbl.hxx
soldep/inc/soldep/objwin.hxx
soldep/inc/soldep/prj.hxx
soldep/inc/soldep/sdtresid.hxx
soldep/inc/soldep/soldep.hxx
soldep/inc/soldep/soldlg.hxx
soldep/inc/soldep/tbox.hxx
soldep/prj/d.lst
soldep/source/connctr.cxx
soldep/source/depapp.hxx
soldep/source/depper.cxx
soldep/source/depwin.cxx
soldep/source/makefile.mk
soldep/source/objwin.cxx
soldep/source/soldep.cxx
soldep/source/soldlg.cxx
soldep/source/soldlg.src
soldep/source/tbox.cxx
solenv/bin/build.pl
solenv/bin/cws.pl
solenv/bin/make_installer.pl
solenv/bin/mhids.pl
solenv/bin/modules/CwsConfig.pm
solenv/bin/modules/RepositoryHelper.pm
solenv/bin/modules/installer/regmerge.pm
solenv/bin/modules/installer/scriptitems.pm
solenv/bin/modules/installer/servicesfile.pm
solenv/bin/modules/installer/simplepackage.pm
solenv/bin/modules/installer/substfilenamefiles.pm
solenv/config/ssolar.cmn
solenv/inc/_tg_rslb.mk
solenv/inc/extension_post.mk
solenv/inc/libs.mk
solenv/inc/minor.mk
solenv/inc/postset.mk
solenv/inc/settings.mk
solenv/inc/tg_rslb.mk
solenv/inc/unxlng.mk
solenv/inc/wntmsc.mk
soltools/HIDCompiler/hidclex.l
stlport/prj/d.lst
stlport/systemstlguards/postextstl.h

37 files changed, 336 insertions, 533 deletions

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 7a9fae3997ca..4da10dd79cde 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -48,29 +48,29 @@ File gid_File_Exe_Odbcconfig
 End
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Abp, abp)
+STD_LIB_FILE( gid_File_Lib_Abp, abp)
 STD_RES_FILE( gid_File_Res_Abp, abp)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
+STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
+STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
+STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
 STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
 
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
 STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
+STD_LIB_FILE( gid_File_Lib_Rpt, rpt )
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
+STD_LIB_FILE( gid_File_Lib_Rptui, rptui )
 STD_RES_FILE( gid_File_Res_Rptui, rptui)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
+STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index be66b907a25d..951caadf69fb 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -39,7 +39,7 @@ File gid_Starregistry_Legacy_Binfilters_Rdb
     TXT_FILE_BODY;
     Name = "legacy_binfilters.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY);
+    Styles = (PACKED);
 End
 
 
@@ -59,8 +59,8 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
 STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
 STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet)
+STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
+STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
 
 STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
 STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 7a2f374a8ced..fc55805d08ec 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -27,7 +27,7 @@
 
 #include "macros.inc"
 
-STD_UNO_LIB_FILE( gid_File_Lib_Solver, solver)
+STD_LIB_FILE( gid_File_Lib_Solver, solver)
 
 #ifndef SYSTEM_LPSOLVE
 File gid_File_Lib_Lpsolve
@@ -36,7 +36,7 @@ File gid_File_Lib_Lpsolve
 End
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
+STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
 File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
@@ -45,17 +45,17 @@ File gid_File_Share_Registry_Calc_Xcd
     Name = "calc.xcd";
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
+STD_LIB_FILE( gid_File_Lib_Calc, calc)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
+STD_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_LIB_FILE( gid_File_Lib_Sc, sc)
 
 STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
+STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
 STD_RES_FILE( gid_File_Res_Solver, solver)
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index c76ae8b2168d..8220610ec5c3 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -859,7 +859,7 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.Calctemplate.1";
+    Subkey = "opendocument.CalcTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -922,7 +922,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "opendocument.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 435cef4304f8..2d7af5321f35 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -29,8 +29,7 @@
 
 File gid_File_Lib_CairoCanvas
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 3b58fc69e0c3..cd2dc9c2d6ea 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,5 +30,5 @@
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index febdb8428c8b..e79f711aaacd 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -29,8 +29,8 @@
 
 #ifdef WNT
 # ifdef USE_DIRECTX5
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
 # endif
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
 #endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index 5f69de34fee9..c17301f56d76 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -27,4 +27,4 @@
 
 #include "macros.inc"
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 5d7e0d99edfc..d722319649cd 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -920,7 +920,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "opendocument.DrawTemplate.1";
     Value = " ";
 End
 
@@ -938,7 +938,7 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "soffice.StarDrawDocument.6";
+    Name = "soffice.StarDrawTemplate.6";
     Value = " ";
 End
 
@@ -948,7 +948,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "opendocument.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 9d10261843d2..d48915072742 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -32,8 +32,6 @@ File gid_File_Lib_GIO
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "ucpgio-ucd.txt";
 End
 #endif
 
@@ -43,8 +41,6 @@ File gid_File_Lib_Gnomevfs
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "ucpgvfs-ucd.txt";
 End
 #endif
 
@@ -63,7 +59,5 @@ File gid_File_Lib_Gconfbe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "gconfbe1-ucd.txt";
 End
 #endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 4ba30a6849a7..ab46b1814710 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -34,8 +34,8 @@ File gid_File_Share_Registry_Graphicfilter_Xcd
     Name = "graphicfilter.xcd";
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
+STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
+STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index cda4495428ee..850593d696a8 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -29,12 +29,12 @@
 
 File gid_File_Lib_Placeware
     Name = LIBNAME(placeware);
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Lib_Animcore
 	Name = SPECIAL_NAME(animcore);
-	PACKED_UNO_LIB_FILE_BODY;
+	PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Share_Registry_Impress_Xcd
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index e3a767a06966..e204e04417bd 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -38,8 +38,7 @@ End
 
 File gid_File_Lib_OpenGLTransitions
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef QUARTZ
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 0885d81d7c31..063bcf91f4eb 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -949,7 +949,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "opendocument.ImpressTemplate.1";
     Value = " ";
 End
 
@@ -967,7 +967,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressDocument.6";
+    Name = "soffice.StarImpressTemplate.6";
     Value = " ";
 End
 
@@ -995,7 +995,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.ImpressTemplate.1";
     Styles = ();
 End
 
@@ -1004,7 +1004,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "soffice.StarImpressDocument.6";
+    Value = "soffice.StarImpressTemplate.6";
     Styles = ();
 End
 
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index d7a902dbf00f..a6d3f3329b25 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -76,6 +76,6 @@ STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc )
 STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
 STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
 STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-UNO_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
+STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 
 #endif
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 1340d637e009..3626d914bef4 100644
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@@ -46,7 +46,7 @@ RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
@@ -106,7 +106,7 @@ RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
@@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
@@ -226,7 +226,7 @@ RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserv
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 0e0b3d1b73bb..3d139b797d67 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -32,8 +32,6 @@ File gid_File_Lib_Kdebe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "kdebe1-ucd.txt";
 End
 #endif
 
@@ -43,7 +41,5 @@ File gid_File_Lib_Kde4be
     Styles = (PACKED);
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "kde4be1-ucd.txt";
 End
 #endif
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 63b87b24624b..c554296d4381 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -37,9 +37,9 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
+STD_LIB_FILE( gid_File_Lib_Sm , sm)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
+STD_LIB_FILE( gid_File_Lib_Smd , smd)
 
 STD_RES_FILE( gid_File_Res_Sm, sm )
 
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index e33eb6fa35c7..2a7ddd376b6f 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -27,7 +27,7 @@
 
 #include "macros.inc"
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
 File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 94f5baf850a3..f167ea270919 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -86,6 +86,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
+             gid_Brand_File_ServicesRdb,
              gid_Brand_File_Share_Registry_Brand_Xcd,
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
@@ -1248,6 +1249,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_PREREG";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_PREREG}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1293,7 +1302,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_SERVICES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES}";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 9cd00117dcbf..ee4ad7522938 100755
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -31,8 +31,8 @@
 Directory gid_Dir_Bundle
     ParentID = PD_PROGDIR;
     HostName = "%PRODUCTNAME.app";
-    LangPackHostName = "%PRODUCTNAME %PRODUCTVERSION Language Pack.app";
-    PatchHostName = "%PRODUCTNAME %PRODUCTVERSION Patch.app";
+    LangPackHostName = "%PRODUCTNAME Language Pack.app";
+    PatchHostName = "%PRODUCTNAME Patch.app";
 End
 #endif
 
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 224d26de6a0d..cd6cfe715d64 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -37,5 +37,5 @@ End
 #endif
 
 #if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 54836a8b8d5c..2edf4e67cab3 100644..100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -35,19 +35,18 @@ File gid_File_Lib_Accessbridge
 End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
+STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
 #endif
 
 #if defined(WNT)
-STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
+STD_LIB_FILE( gid_File_Lib_Ado, ado)
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
+STD_LIB_FILE( gid_File_Lib_Basctl, basctl)
 
 File gid_File_Lib_Basprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -56,11 +55,9 @@ File gid_File_Lib_Basprov
   #endif
 End
 
-#ifdef ENABLE_VBA
 File gid_File_Lib_Vbaevent
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -68,14 +65,12 @@ File gid_File_Lib_Vbaevent
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
   #endif
 End
-#endif // ENABLE_VBA
 
-STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
+STD_LIB_FILE( gid_File_Lib_Bib , bib)
 
 File gid_File_Lib_Cached1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
@@ -84,13 +79,12 @@ File gid_File_Lib_Cached1
   #endif
 End
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX));
@@ -100,10 +94,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
+STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
+STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
 #if defined WNT && defined _MSC
@@ -157,23 +151,22 @@ End
 
 
 #if ! defined WNT // no longer supported on Windows
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
 #endif
 
 
 File gid_File_Lib_Comphelper2
     TXT_FILE_BODY;
   #ifdef UNX
-    Name = STRING(CONCAT3(libcomphelp4,COMID,UNXSUFFIX));
+    Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT3(comphelp4,COMID,.dll));
+    Name = STRING(CONCAT3(comphelp,COMID,.dll));
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
+STD_LIB_FILE( gid_File_Lib_Ctl , ctl)
 
 STD_LIB_FILE( gid_File_Lib_Cui, cui)
 
@@ -228,15 +221,13 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
-
-STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
+STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
+STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
+STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
+STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
 STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -244,8 +235,7 @@ STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
 
 File gid_File_Lib_Dbpool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
@@ -254,9 +244,9 @@ File gid_File_Lib_Dbpool
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
+STD_LIB_FILE( gid_File_Lib_Dbt, dbtools )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
+STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
 
 File gid_File_Lib_Dict_Ja
     TXT_FILE_BODY;
@@ -315,8 +305,7 @@ End
 
 File gid_File_Lib_Dlgprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -327,8 +316,7 @@ End
 
 File gid_File_Lib_Stringresource
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -337,13 +325,9 @@ File gid_File_Lib_Stringresource
   #endif
 End
 
-#if defined ENABLE_VBA
-#ifndef VBA_EXTENSION
-
 File gid_File_Lib_Vbaobj
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -354,33 +338,29 @@ End
 
 File gid_File_Lib_Vbaswobj
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
   #endif
 End
 
 File gid_File_Lib_Vbamsforms
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(msforms,.uno,.dll));
   #endif
 End
 
-#endif // VBA_EXTENSION
 File gid_File_Lib_Vbahelper
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
@@ -388,15 +368,13 @@ File gid_File_Lib_Vbahelper
     Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
   #endif
 End
-#endif // ENABLE_VBA
 
 
 #ifdef WNT
 
 File gid_File_Lib_Dnd
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "dnd.dll";
 End
@@ -409,23 +387,22 @@ File gid_File_Lib_Dtrans
     TXT_FILE_BODY;
     Name = "dtrans.dll";
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #endif
 
 STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
+SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
 #ifndef DISABLE_ATL
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
+SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #endif
 
 #if defined(WNT) && !defined(DISABLE_ATL)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
+STD_LIB_FILE( gid_File_Lib_Emser, emser )
 
 File gid_File_Lib_Inprocserv
     TXT_FILE_BODY;
@@ -441,8 +418,7 @@ End
 #ifdef ENABLE_KAB
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
 End
@@ -459,8 +435,7 @@ End
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
 End
@@ -476,7 +451,7 @@ End
 
 #ifdef ENABLE_EVOAB2
 
-STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
+STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 #endif  // #ifdef ENABLE_EVOAB2
 
@@ -484,8 +459,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 File gid_File_Lib_Evtatt
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
@@ -494,24 +468,22 @@ File gid_File_Lib_Evtatt
   #endif
 End
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
+SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
+STD_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
 
 File gid_File_Lib_Fop
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fop.dll";
 End
@@ -522,8 +494,7 @@ End
 
 File gid_File_Lib_Fps
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
 End
@@ -537,8 +508,6 @@ File gid_File_Lib_Desktopbe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "desktopbe1-ucd.txt";
 End
 
 #ifdef ENABLE_GTK
@@ -546,10 +515,8 @@ End
 File gid_File_Lib_Fps_Gnome
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
-    Regmergefile = "fps-gnome-ucd.txt";
 End
 #endif
 #endif
@@ -557,11 +524,9 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Fps_Kde4
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-    Regmergefile = "fps-kde4-ucd.txt";
 End
 #endif
 #endif
@@ -569,11 +534,9 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Fps_Kde
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
-    Regmergefile = "fps-kde-ucd.txt";
 End
 File gid_File_Bin_KdeFilePicker
     BIN_FILE_BODY;
@@ -589,35 +552,31 @@ End
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
-    Regmergefile = "fps-aqua-ucd.txt";
 End
 
 File gid_File_Lib_MacOSXSpell
 	TXT_FILE_BODY;
-	Styles = (PACKED,UNO_COMPONENT);
-	RegistryID = gid_Starregistry_Services_Rdb;
+	Styles = (PACKED);
 	Name = LIBNAME(MacOSXSpell);
 	Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_avmediaQuickTime
 	TXT_FILE_BODY;
-	Styles = (PACKED,UNO_COMPONENT);
-	RegistryID = gid_Starregistry_Services_Rdb;
+	Styles = (PACKED);
 	Name = LIBNAME(avmediaQuickTime);
 	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
 #ifdef WNT
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
 
 #if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
@@ -658,16 +617,15 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
+STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
 
 #ifdef WNT
 
 File gid_File_Lib_Ftransl
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "ftransl.dll";
 End
@@ -681,14 +639,13 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Fwl , fwl)
+STD_LIB_FILE( gid_File_Lib_Fwl , fwl)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm)
+STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
 
 #ifdef WNT
 File gid_File_Lib_Gdiplus
@@ -699,14 +656,13 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
@@ -728,8 +684,7 @@ End
 
 File gid_File_Lib_I18nsearch
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
@@ -810,15 +765,14 @@ End
 
 #ifdef SOLAR_JAVA
 
-STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
+STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
 
 #endif
 
 #ifdef SOLAR_JAVA
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
@@ -884,7 +838,7 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
+STD_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
     TXT_FILE_BODY;
@@ -932,8 +886,7 @@ End
 
 File gid_File_Lib_Mcnttype
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
@@ -944,15 +897,14 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
-STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
+STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
 #else
 
 File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
@@ -963,15 +915,15 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
+STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 
-STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)
+STD_LIB_FILE(gid_File_Lib_Msworks,msworks)
 
-STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
+STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
 
-STD_UNO_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
+STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
 
-STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
+STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
 #ifdef WNT
 #if defined(_gcc3)
@@ -1080,12 +1032,12 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc)
+STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
 
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
@@ -1108,23 +1060,22 @@ End
 
 File gid_File_Lib_Ole
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "oleautobridge.uno.dll";
 End
 
 #endif
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
+SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Pcr, pcr)
+STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Log, log)
+STD_LIB_FILE( gid_File_Lib_Log, log)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
+STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
 
 File gid_File_Lib_Deployment
 #if defined UNX
@@ -1132,7 +1083,7 @@ File gid_File_Lib_Deployment
 #else
     Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll));
 #endif
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Lib_DeploymentGui
@@ -1141,18 +1092,18 @@ File gid_File_Lib_DeploymentGui
 #else
     Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll));
 #endif
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
 #ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
+STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
+STD_LIB_FILE( gid_File_Lib_Preload, preload)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
 
 #if defined(UNX) && ! defined(QUARTZ)
 File gid_File_Lib_Desktop_Detector
@@ -1270,15 +1221,13 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 File gid_File_Lib_Sax_Uno
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
@@ -1289,8 +1238,7 @@ End
 
 File gid_File_Lib_Fastsax_Uno
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
@@ -1301,11 +1249,11 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sax , sax)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
+STD_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
+STD_LIB_FILE( gid_File_Lib_Sb , sb)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
+STD_LIB_FILE( gid_File_Lib_Scn, scn)
 
 File gid_File_Lib_Scriptframe
     TXT_FILE_BODY;
@@ -1318,18 +1266,16 @@ File gid_File_Lib_Scriptframe
   #else
     Name = "scriptframe.dll";
   #endif
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
@@ -1340,8 +1286,7 @@ End
 
 File gid_File_Lib_Sdbc_2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
@@ -1350,16 +1295,15 @@ File gid_File_Lib_Sdbc_2
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sdd , sdd)
+STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
+STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 #ifdef WNT
@@ -1377,15 +1321,14 @@ End
 
 File gid_File_Lib_Smplmail
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "smplmail.uno.dll";
 End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
+STD_LIB_FILE( gid_File_Lib_Sot, sot )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -1400,66 +1343,63 @@ End
 
 File gid_File_Lib_Spell
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(spell);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
+STD_LIB_FILE( gid_File_Lib_Spl, spl)
 #if defined ENABLE_UNIX_QUICKSTARTER
-STD_UNO_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
+STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
+SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_LIB_FILE( gid_File_Lib_Svtools, svt )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
-STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
-STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_LIB_FILE( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Sw , sw)
 STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
 End
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
 
 #ifdef WNT
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 #endif
 
 #ifdef MACOSX
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, tk )
 STD_LIB_FILE( gid_File_Lib_Acc, acc )
 
 STD_LIB_FILE( gid_File_Lib_Tools, tl )
 
 File gid_File_Lib_Tvhlp1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
@@ -1470,8 +1410,7 @@ End
 
 File gid_File_Lib_Ucb1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
@@ -1499,90 +1438,83 @@ File gid_File_Lib_Ucpchelp1
     Name = "ucpchelp1.dll";
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
  #ifndef SYSTEM_NEON
    SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
  #endif
 #endif
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
 #ifdef WNT
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(lnth);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_Hyph
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(hyphen);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
+STD_LIB_FILE( gid_File_Lib_Utl , utl)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
+STD_LIB_FILE( gid_File_Lib_Uui, uui )
 
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
-
-STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)
-STD_UNO_LIB_FILE( gid_File_Lib_Xmx , xmx)
-STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
+STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
+STD_LIB_FILE( gid_File_Lib_Xmx , xmx)
+STD_LIB_FILE( gid_File_Lib_Xof , xof)
 
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Xstor,xstor)
+SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
-STD_UNO_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
-STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
-STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
-STD_UNO_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
+STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
+STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
+STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
+STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
+STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
-UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
+STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
+STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 #endif
 
 #ifndef SYSTEM_LIBXSLT
@@ -1607,21 +1539,21 @@ End
 #endif
 
 
-STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
+STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 
 // AVMedia
-STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
+STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
 #ifdef GSTREAMER
-SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
 #else
 #if defined UNX
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
+STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
 #elif defined WNT
 #ifdef ENABLE_DIRECTX
-SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
+SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
 #endif
@@ -1635,8 +1567,7 @@ File gid_File_Lib_XSec_Framework
         Name = "xsec_fw.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 File gid_File_Lib_XSec_XmlSec
@@ -1647,8 +1578,7 @@ File gid_File_Lib_XSec_XmlSec
         Name = "xsec_xmlsec.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 File gid_File_Lib_XSec_XMLSecurity
@@ -1659,8 +1589,7 @@ File gid_File_Lib_XSec_XMLSecurity
         Name = "xmlsecurity.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #ifdef WNT
@@ -1692,8 +1621,7 @@ End
 
 File gid_File_Lib_Migrationoo2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
@@ -1704,8 +1632,7 @@ End
 
 File gid_File_Lib_Migrationoo3
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(migrationoo3.uno,UNXSUFFIX));
@@ -1727,11 +1654,11 @@ File gid_File_Lib_Libtextcat
 End
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
+STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
+STD_LIB_FILE( gid_File_Lib_Updchkui , updchk )
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
@@ -1779,7 +1706,7 @@ File gid_File_Lib_Unopkgapp
     Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
     !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME)
@@ -1864,9 +1791,9 @@ File gid_File_Lib_Rdf
 End
 #endif // SYSTEM_REDLAND
 
-STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf)
+STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 
-STD_UNO_LIB_FILE( gid_File_Lib_For, for)
+STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9719cb2a8603..0c3392e4dc9e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -135,35 +135,6 @@ End
 #endif
 #endif
 
-File gid_File_Bin_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = "gengal.bin";
-  #else
-    Name = "gengal.exe";
-  #endif
-End
-
-#ifdef UNX
-
-File gid_File_Script_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "gengal";
-End
-
-#endif
-
-File gid_File_Profile_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = PROFILENAME(gengal);
-End
-
 #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
 
 File gid_File_Bin_Pluginapp
@@ -391,12 +362,6 @@ STD_FILTER_FILE( gid_File_Filter_Iti, iti)
 
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
-STD_RES_FILE( gid_File_Res_Egi, egi )
-
-STD_RES_FILE( gid_File_Res_Ept, ept )
-
-STD_RES_FILE( gid_File_Res_Eme, eme )
-
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -423,14 +388,13 @@ File gid_File_Help_Schart_Zip
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
-#if defined SOLAR_JAVA && defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
+#if defined WNT
 
 File gid_File_Jar_Accessbridge
     TXT_FILE_BODY;
     Name = "java_uno_accessbridge.jar";
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT);
+    Styles = (PACKED,DONT_OVERWRITE);
 End
 
 #endif
@@ -449,7 +413,7 @@ STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
 #endif
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
+STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -469,14 +433,14 @@ End
 
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Report, report )
-UNO_JAR_FILE( gid_File_Jar_Table, table )
-UNO_JAR_FILE( gid_File_Jar_Letter, letter )
-UNO_JAR_FILE( gid_File_Jar_Form, form )
-UNO_JAR_FILE( gid_File_Jar_Fax, fax )
-UNO_JAR_FILE( gid_File_Jar_Agenda, agenda )
-UNO_JAR_FILE( gid_File_Jar_Query, query )
-UNO_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Report, report )
+STD_JAR_FILE( gid_File_Jar_Table, table )
+STD_JAR_FILE( gid_File_Jar_Letter, letter )
+STD_JAR_FILE( gid_File_Jar_Form, form )
+STD_JAR_FILE( gid_File_Jar_Fax, fax )
+STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
+STD_JAR_FILE( gid_File_Jar_Query, query )
+STD_JAR_FILE( gid_File_Jar_Web, web )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -496,8 +460,8 @@ End
 #endif
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -927,9 +891,16 @@ File gid_File_Lm_Scots_Gaelic
     Styles = (PACKED);
 End
 
-File gid_File_Lm_Serbian_Ascii
+File gid_File_Lm_Serbian
     TXT_FILE_BODY;
-    Name = "serbian_ascii.lm";
+    Name = "serbian.lm";
+    Dir = gid_Dir_Share_Fingerprint;
+    Styles = (PACKED);
+End
+
+File gid_File_Lm_Serbian_Latin
+    TXT_FILE_BODY;
+    Name = "serbian-latin.lm";
     Dir = gid_Dir_Share_Fingerprint;
     Styles = (PACKED);
 End
@@ -1183,23 +1154,12 @@ File gid_File_Rdb_Offapi
     Name = "offapi.rdb";
 End
 
-#if defined ENABLE_VBA
-#ifndef VBA_EXTENSION
 File gid_File_Rdb_TypesVba
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Styles = (PACKED, OVERWRITE);
     Name = "oovbaapi.rdb";
 End
-#else
-File gid_File_ExtnVba
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED, OVERWRITE);
-    Name = "vbaapi.oxt";
-End
-#endif
-#endif
 
 File gid_File_Registry_Lang
     Dir = gid_Dir_Share_Registry_Res;
@@ -1711,13 +1671,7 @@ File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
     Name = "services.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY);
-#if defined WNT
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
-#else
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
-#endif
-    JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
+    Styles = (PACKED);
 End
 
 #ifdef LINUX
@@ -1830,9 +1784,8 @@ End
 File gid_File_Jar_Productregistration
     TXT_FILE_BODY;
     Name = "productregistration.jar";
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 #endif
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 5e4a2b0ff089..cbd8ff609721 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -45,12 +45,6 @@ STD_RES_FILE( gid_File_Res_Dbw, dbw )
 
 STD_RES_FILE( gid_File_Res_Dkt, dkt)
 
-STD_RES_FILE( gid_File_Res_Epb, epb )
-
-STD_RES_FILE( gid_File_Res_Epg, epg )
-
-STD_RES_FILE( gid_File_Res_Epp, epp )
-
 STD_RES_FILE( gid_File_Res_Eur, eur )
 
 STD_RES_FILE( gid_File_Res_Frm, frm)
@@ -95,10 +89,9 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
-STD_RES_FILE( gid_File_Res_Svs, svs )
+STD_RES_FILE( gid_File_Res_Svl, svl )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
-STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
 STD_RES_FILE( gid_File_Res_Editeng, editeng )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index b2dec77bac55..d4ec0c0f95f2 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -52,9 +52,6 @@ SCPDEFS+=-DBUILD_X64
 .IF "$(ENABLE_OPENGL)"=="TRUE"
 SCPDEFS+=-DENABLE_OPENGL
 .ENDIF
-
-SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
-
 .IF "$(PROF_EDITION)"!=""
 SCPDEFS+=-DPROF_EDITION
 .ENDIF
@@ -221,13 +218,6 @@ SCPDEFS+=-DSYSTEM_NEON
 SCPDEFS+=-DOPENSSL
 .ENDIF
 
-.IF "$(ENABLE_VBA)" == "YES"
-    .IF "$(VBA_EXTENSION)" == "YES"
-        SCPDEFS+=-DVBA_EXTENSION
-    .ENDIF
-SCPDEFS+=-DENABLE_VBA
-.ENDIF
-
 .IF "$(DISABLE_ATL)"!=""
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b73a5b5be620..faa50a3d71c5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -211,7 +211,6 @@ Module gid_Module_Root_Files_4
     gid_File_Lib_Sdbt,
     gid_File_Lib_Dbmm,
 	gid_File_Lib_Dba,
-	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
@@ -649,7 +648,8 @@ Module gid_Module_Root_Files_6
     gid_File_Lm_Sanskrit,
     gid_File_Lm_Scots,
     gid_File_Lm_Scots_Gaelic,
-    gid_File_Lm_Serbian_Ascii,
+    gid_File_Lm_Serbian,
+    gid_File_Lm_Serbian_Latin,
     gid_File_Lm_Slovak_Ascii,
     gid_File_Lm_Slovenian,
     gid_File_Lm_Spanish,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 8cfc353729d5..bfe1162976fd 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -64,9 +64,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Dbw,
              gid_File_Res_Dkt,
              gid_File_Res_Editeng,
-             gid_File_Res_Epb,
-             gid_File_Res_Epg,
-             gid_File_Res_Epp,
              gid_File_Res_Eur,
              gid_File_Res_For,
              gid_File_Res_Forui,
@@ -87,9 +84,8 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Sd,
              gid_File_Res_Sfx,
              gid_File_Res_Spa,
-             gid_File_Res_Svs,
+             gid_File_Res_Svl,
              gid_File_Res_Svt,
-             gid_File_Res_Svp,
              gid_File_Res_Svx,
              gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
@@ -108,9 +104,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Stt,
              gid_File_Res_Tfu,
              gid_File_Res_Eps,
-             gid_File_Res_Egi,
-             gid_File_Res_Ept,
-             gid_File_Res_Eme,
              gid_File_Res_UpdChk,
              gid_File_Res_Upd);
 End
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index f2771c2332be..4878a790b040 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -697,11 +697,11 @@ en-US = "Mongolian"
 [STR_DESC_MODULE_LANGPACK_MN]
 en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
 
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_BO]
 en-US = "Tibetan"
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 74a9dc33a8f7..dcdf99b1718d 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -39,6 +39,13 @@ Directory gid_Dir_Brand_Root
 End
 #endif
 
+File gid_Brand_File_ServicesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "/ooo/services.rdb";
+    Styles = (PACKED);
+End
+
 ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -52,4 +59,3 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
   #endif
 End
 
-BRAND_RES_FILE( gid_Brand_File_Res_Ooo, ooo )
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 724316ba6f5e..3c6dfefc1286 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -191,6 +191,16 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
     Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_Prereg
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS_PREREG";
+    Value = "$BRAND_BASE_DIR/share/prereg/bundled";
+End
+
+
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -287,6 +297,14 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
     Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_Prereg
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_PREREG";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -324,11 +342,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_TYPES";
-#if defined ENABLE_VBA && !defined VBA_EXTENSION
     Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-#else
-    Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-#endif
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 0053abaaec9e..4e3e096eb592 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -356,23 +356,6 @@ Unixlink gid_Unixlink_File_Dl_Reg
 End
 #endif
 
-File gid_File_Dl_Rmcxt
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("rmcxt", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E0C091E3-7C18-4C32-B9CF-4D95AC243801";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Rmcxt
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("rmcxt");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_VER("rmcxt", "3");
-End
-#endif
 
 
 File gid_File_Dl_Store
@@ -383,6 +366,16 @@ File gid_File_Dl_Store
     // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
 End
 
+
+File gid_File_Dl_Xmlreader
+    TXT_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("xmlreader");
+    Styles = (PACKED);
+End
+
+
+
 #ifdef AIX
 Unixlink gid_Unixlink_File_Dl_Store
     BIN_FILE_BODY;
@@ -484,14 +477,6 @@ Shortcut gid_Shortcut_Dl_JavaUno
 End
 #endif
 
-File gid_File_Dl_UrpUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("urp_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D9F647ED-8E6F-4F80-8D2B-A45372B6AB60";
-End
-
 File gid_File_Dl_UnsafeUnoUno
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -768,35 +753,30 @@ File gid_File_Dl_Acceptor
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("acceptor.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
 End
 
-File gid_File_Dl_Bootstrap
+File gid_File_Dl_Binaryurp
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bootstrap.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
-    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
+    Name = SCP2_URE_DL_BARE("binaryurp.uno");
+    Styles = (PACKED);
 End
 
-File gid_File_Dl_Bridgefac
+File gid_File_Dl_Bootstrap
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bridgefac.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
-    // CompID = "E025163F-FE1E-4E8C-B0E5-49C08924A646";
+    Name = SCP2_URE_DL_BARE("bootstrap.uno");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
 End
 
 File gid_File_Dl_Connector
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("connector.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
 End
 
@@ -804,8 +784,7 @@ File gid_File_Dl_Introspection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("introspection.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
 End
 
@@ -813,8 +792,7 @@ File gid_File_Dl_Invocadapt
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocadapt.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
 End
 
@@ -822,8 +800,7 @@ File gid_File_Dl_Invocation
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocation.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
 End
 
@@ -833,8 +810,7 @@ File gid_File_Dl_Javaloader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javaloader.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
 End
 #endif
@@ -844,8 +820,7 @@ File gid_File_Dl_Javavm
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javavm.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
 End
 #endif
@@ -854,8 +829,7 @@ File gid_File_Dl_Namingservice
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("namingservice.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
 End
 
@@ -863,8 +837,7 @@ File gid_File_Dl_Stocservices
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("stocservices.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
 End
 
@@ -872,8 +845,7 @@ File gid_File_Dl_Proxyfac
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("proxyfac.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
 End
 
@@ -881,26 +853,15 @@ File gid_File_Dl_Reflection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("reflection.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
 End
 
-File gid_File_Dl_Remotebridge
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("remotebridge.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
-    // CompID = "B440B28E-B7AD-40C7-89E1-1508CA798347";
-End
-
 File gid_File_Dl_Streams
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("streams.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
 End
 
@@ -908,8 +869,7 @@ File gid_File_Dl_Textinstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textinstream.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
 End
 
@@ -917,8 +877,7 @@ File gid_File_Dl_Textoutstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textoutstream.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
 End
 
@@ -926,8 +885,7 @@ File gid_File_Dl_Uuresolver
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("uuresolver.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
 End
 
@@ -1092,8 +1050,7 @@ File gid_File_Java_JuhJar
     TXT_FILE_BODY;
     Dir = gid_Dir_Ure_Java;
     Name = "juh.jar";
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
 End
 #endif
@@ -1140,6 +1097,13 @@ File gid_File_Misc_TypesRdb
     // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
 End
 
+File gid_File_Misc_ServicesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Ure_Misc;
+    Name = "/ure/services.rdb";
+    Styles = (PACKED);
+End
+
 // Private Miscellaneous Files:
 
 #if defined SOLAR_JAVA
@@ -1152,18 +1116,6 @@ File gid_File_Misc_JavavendorsXml
 End
 #endif
 
-// StarRegistry File
-
-File gid_Starregistry_Services_Rdb_Ure
-    TXT_FILE_BODY;
-    Name = "services.rdb";
-    Dir = gid_Dir_Ure_Misc;
-    Styles = (PACKED, STARREGISTRY, VERSION_INDEPENDENT_COMP_ID);
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/";
-    JavaServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_JAVA_DIR/";
-    // CompID = "F4BD7B0A-5A20-4167-9D10-18597C5F85AF";
-End
-
 #if defined MACOSX
 Unixlink gid_Unixlink_Ure_Bin_Urelibs
     Dir = gid_Dir_Ure_Bin;
@@ -1228,10 +1180,10 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Uno,
             gid_File_Dl_Reg,
             gid_Unixlink_File_Dl_Reg,
-            gid_File_Dl_Rmcxt,
             gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_Store,
             gid_Unixlink_File_Dl_Store,
+            gid_File_Dl_Xmlreader,
             gid_File_Dl_Jvmaccess,
             gid_Unixlink_File_Dl_Jvmaccess,
             gid_File_Dl_Jvmfwk,
@@ -1241,7 +1193,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Jvmfwk3rc,
             gid_File_Dl_ComnameUno,
             gid_File_Dl_JavaUno,
-            gid_File_Dl_UrpUno,
             gid_File_Dl_UnsafeUnoUno,
             gid_File_Dl_AffineUnoUno,
             gid_File_Dl_LogUnoUno,
@@ -1250,8 +1201,8 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Juh,
             gid_File_Dl_Juhx,
             gid_File_Dl_Acceptor,
+            gid_File_Dl_Binaryurp,
             gid_File_Dl_Bootstrap,
-            gid_File_Dl_Bridgefac,
             gid_File_Dl_Connector,
             gid_File_Dl_Introspection,
             gid_File_Dl_Invocadapt,
@@ -1261,7 +1212,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Namingservice,
             gid_File_Dl_Proxyfac,
             gid_File_Dl_Reflection,
-            gid_File_Dl_Remotebridge,
             gid_File_Dl_Stocservices,
             gid_File_Dl_Streams,
             gid_File_Dl_Textinstream,
@@ -1286,8 +1236,8 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Java_RidlJar,
             gid_File_Java_JavaUnoJar,
             gid_File_Misc_TypesRdb,
-            gid_File_Misc_JavavendorsXml,
-            gid_Starregistry_Services_Rdb_Ure);
+            gid_File_Misc_ServicesRdb,
+            gid_File_Misc_JavavendorsXml);
     Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
                  gid_Unixlink_File_Dl_Sal,
                  gid_Unixlink_File_Dl_Salhelper,
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 1228900121b7..e36ca23f7155 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -46,9 +46,7 @@ File gid_File_Lib_Pythonloader
   #else
     Name = "pythonloader.uno.dll";
   #endif
-    RegistryID = gid_Starregistry_Services_Rdb;
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 
 File gid_File_Py_Unohelper
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 9ad34a2908f0..ec3a40ce0af5 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -32,7 +32,6 @@ File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "mailmerge.py";
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 #endif
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 86faf16faefc..3b30c157fa36 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -46,13 +46,6 @@ File gid_File_Bin_Testtool
     Name = "testtool.bin";
 End
 
-File gid_File_Hid_Testtool
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "hid.lst";
-End
-
 File gid_File_Config_Testtool
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 8d49c94eaa57..32b151633f67 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,19 +27,9 @@
 
 #include "macros.inc"
 
-STD_UNO_LIB_FILE( gid_File_Lib_Swd , swd)
+STD_LIB_FILE( gid_File_Lib_Swd , swd)
 
-File gid_File_Lib_Hwpreader
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libhwp,UNXSUFFIX));
-  #else
-    Name = "hwp.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
+SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 6810cf8ff8e6..6e3d9741430b 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1314,7 +1314,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1323,7 +1323,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1332,7 +1332,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1432,7 +1432,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1441,7 +1441,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "soffice.StarWriterDocument.6";
+    Value = "soffice.StarWriterTemplate.6";
     Styles = ();
 End
 
@@ -1513,7 +1513,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1522,7 +1522,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterGlobalDocument.1";
     Styles = ();
 End