impress186: merge with DEV300m86

author: sj <sj@openoffice.org> 2010-08-13 15:02:26 +0200
committer: sj <sj@openoffice.org> 2010-08-13 15:02:26 +0200
commit: 3e05df357ef0c5c9274e03d43cea14967a158e38 (patch)
tree: 7085d41dd595ac647da0698ab47e633a93dae359 /scp2
parent: 10b609fdd5ce1e18be7b0ccbb3bb337039d30f2b (diff)
parent: d3087ee5d37ab92486d624c81e24ebda92bef26c (diff)
28 files changed, 1048 insertions, 622 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 48a1ae148777..91c74499a916 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -424,6 +424,15 @@ End
         Value = " "; \
     End
 
+#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = " "; \
+    End
+
 #define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     RegistryItem gid_Regitem__##name \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
@@ -501,7 +510,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -511,7 +520,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -530,7 +539,7 @@ End
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     REGISTRY_ENTRY_DOC(name,modid,disp_name) \
     REGISTRY_ENTRY_ICON(name,modid,icon_id) \
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index d7cba78f6101..ca3c94b759e0 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Binfilter
     Sortkey = "700";
     InstallOrder = "1100";
     ParentID = gid_Module_Optional;
-    Default = YES;
+    Default = NO;
     Files = (gid_File_Share_Registry_Binfilter_Xcd,
     gid_Starregistry_Legacy_Binfilters_Rdb,
     gid_File_Lib_Bf_Go,
@@ -60,6 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
     ParentID = gid_Module_Optional_Binfilter;
     Name = "gid_Module_Langpack_Binfilter_Template";
     Description = "gid_Module_Langpack_Binfilter_Template";
+    Default = NO;
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Res_Bf_Sch,
              gid_File_Res_Bf_Svx,
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index aaba3cd6c2ab..7b392f173378 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index efc71ac73f63..a4708523640f 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -800,7 +800,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
@@ -863,7 +863,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/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 0ecb21536613..63dde34437a1 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -863,7 +863,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
 
@@ -881,7 +881,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
 
@@ -891,7 +891,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/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cce7f1d85ad3..7b270e5aca30 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -892,7 +892,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
 
@@ -910,7 +910,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
 
@@ -938,7 +938,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
 
@@ -947,7 +947,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/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 593c6177edad..1340d637e009 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 = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\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 = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\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 = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\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 = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b2023aabecd7..a7c1f2826381 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -43,7 +43,6 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_C05_Faq,
             gid_Brand_Dir_Share_Config,
             gid_Brand_Dir_Share_Extension,
-            gid_Brand_Dir_Share_Extension_Install,
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Registry,
@@ -80,20 +79,24 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Msvcr80,
              gid_Brand_File_Lib_Msvcp80,
              gid_Brand_File_Lib_Msvcm80,
+			 gid_Brand_File_Lib_Oirm,
+			 gid_Brand_File_Lib_Oirm2,
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
              gid_Brand_File_Share_Registry_Brand_Xcd,
-             gid_Brand_File_Share_Registry_O5oo_Xcd
+             gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
              gid_Brand_File_Share_Xdg_Draw,
              gid_Brand_File_Share_Xdg_Extension,
              gid_Brand_File_Share_Xdg_Impress,
+             gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
              gid_Brand_File_Share_Xdg_QStart,
+             gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
@@ -119,6 +122,7 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Share_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
+             gid_Brand_File_Res_Oirm,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
@@ -212,10 +216,179 @@ Directory gid_Brand_Dir_Share_Extension
     DosName = "extension";
 End
 
-Directory gid_Brand_Dir_Share_Extension_Install
+Directory gid_Brand_Dir_Share_Extensions
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "extensions";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Install
     ParentID = gid_Brand_Dir_Share_Extension;
     DosName = "install";
-    Styles = (CREATE);
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Af
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-af";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ca";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Cs
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-cs";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Da
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-da";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-AT";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-CH";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-de-DE";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_En
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-en";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Es
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-es";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Et
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-et";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-fr";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-gl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_He
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-he";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-hu";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_It
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-it";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ku-TR";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Lt
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-lt";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ne
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ne";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Nl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-nl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_No
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-no";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-pl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Pt
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-pt";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ro";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ru
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ru";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sk
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sk";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sl
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sl";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sr";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sv
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sv";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Sw
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-sw";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Th
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-th";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-vi";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Dict_Zu
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-zu";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Oooimprovement
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "OOoImprovement";
 End
 
 Directory gid_Brand_Dir_Share_Uno_Packages
@@ -569,6 +742,25 @@ File gid_Brand_File_Share_Xdg_Writer
 End
 #endif
 
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_StartCenter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "startcenter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_JavaFilter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "javafilter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+
 #if defined WNT && defined(_gcc3)
 File gid_Brand_File_Lib_Mingwm10
     BIN_FILE_BODY;
@@ -1025,6 +1217,22 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
 #endif
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1033,6 +1241,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_SHARED_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":SHARED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1041,6 +1257,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_USER_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "TMP_EXTENSIONS";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1190,7 +1414,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "UREINSTALLLOCATION";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]URE\\";
     Inifiletablekey = "UreInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
@@ -1204,7 +1428,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "BASISINSTALLLOCATION";
-    Value = "[BASISINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]Basis\\";
     Inifiletablekey = "BasisInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
@@ -1218,7 +1442,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
     Section = "Bootstrap";
     Order = 4;
     Key = "OFFICEINSTALLLOCATION";
-    Value = "[OFFICEINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
     Inifiletablekey = "OfficeInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 8ad8526d9ef6..10e2dca219fb 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -142,7 +142,7 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
 File gid_File_FcLocal_Conf
     Dir = gid_Dir_Fonts_Truetype;
     USER_FILE_BODY;
-#   Styles = ();
+//  Styles = ();
     Name = "fc_local.conf";
 End
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5ce656d436eb..d930b2dc9fa2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview)
+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)
 
 
 #if defined WNT && defined _MSC
@@ -228,7 +228,7 @@ End
 File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
@@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1142,7 +1142,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1151,7 +1151,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1161,7 +1161,7 @@ End
 File gid_File_Lib_Vclplug_Kde4
     Name = LIBNAME(vclplug_kde4);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1172,7 +1172,7 @@ End
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1181,13 +1181,13 @@ End
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 
 File gid_File_Lib_Recentfile
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
@@ -1238,7 +1238,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1381,7 +1381,7 @@ SPECIAL_UNO_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_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_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)
@@ -1390,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
@@ -1514,7 +1514,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1539,7 +1539,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1583,7 +1583,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX
+#if defined UNX 
+#if defined ENABLE_GSTREAMER
+SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
+#endif
 #ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 82abc911e2a7..d1aa01f2aeb1 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1864,288 +1864,288 @@ End
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Af
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
 	Name = "dict-af.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ca
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
     Name = "dict-ca.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Cs
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs;
 	Name = "dict-cs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Da
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_AT
-	Dir = gid_Brand_Dir_Share_Extension_Install;
-    Name = "dict-de-AT.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
+	Name = "dict-de-AT.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_CH
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
     Name = "dict-de-CH.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_DE
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
     Name = "dict-de-DE.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_En
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Es
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
 	Name = "dict-es.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Et
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Fr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
 	Name = "dict-gl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_He
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
     Name = "dict-he.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Hu
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ku_Tr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr;
 	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lt
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt;
 	Name = "dict-lt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ne
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
 	Name = "dict-ne.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Nl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl;
 	Name = "dict-nl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_No
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
     Name = "dict-no.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pt
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ro
-    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
     Name = "dict-ro.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ru
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru;
 	Name = "dict-ru.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sk
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sl
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sr
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr;
 	Name = "dict-sr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sv
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sw
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw;
 	Name = "dict-sw.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Th
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
 	Name = "dict-th.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Vi
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
 	Name = "dict-vi.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Zu
-	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu;
 	Name = "dict-zu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2153,8 +2153,8 @@ End
 // #ifdef BUILD_SPECIAL
 // File gid_File_Extension_Oxt_Oooimprovement
 //    Name = "OOoImprovement.oxt";
-//    Dir = gid_Brand_Dir_Share_Extension_Install;
-//    Styles = (PACKED);
+//    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;
+//    Styles = (PACKED, ARCHIVE);
 //    UnixRights = 444;
 // End
 // #endif
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0777febdc869..a671447b5758 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
+.IF "$(ENABLE_GSTREAMER)" != ""
+SCPDEFS+=-DENABLE_GSTREAMER
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a4ab3bfab762..e8c20f99ca94 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
+	gid_File_Lib_AVMediaGst,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
@@ -808,354 +809,4 @@ End
 // End
 // #endif
 
-Module gid_Module_Root_Extension_Dictionary_Af
-	Name = "gid_Module_Root_Extension_Dictionary_Af";
-	Description = "gid_Module_Root_Extension_Dictionary_Af";
-	Files = (gid_File_Extension_Dictionary_Af);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "af";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ca
-    Name = "gid_Module_Root_Extension_Dictionary_Ca";
-    Description = "gid_Module_Root_Extension_Dictionary_Ca";
-    Files = (gid_File_Extension_Dictionary_Ca);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "ca";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Cs
-	Name = "gid_Module_Root_Extension_Dictionary_Cs";
-	Description = "gid_Module_Root_Extension_Dictionary_Cs";
-	Files = (gid_File_Extension_Dictionary_Cs);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "cs";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Da
-	Name = "gid_Module_Root_Extension_Dictionary_Da";
-	Description = "gid_Module_Root_Extension_Dictionary_Da";
-	Files = (gid_File_Extension_Dictionary_Da);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "da";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_AT
-    Name = "gid_Module_Root_Extension_Dictionary_De_AT";
-    Description = "gid_Module_Root_Extension_Dictionary_De_AT";
-    Files = (gid_File_Extension_Dictionary_De_AT);
-	InstallOrder = "2000";
-    Spellcheckerlanguage = "de-AT";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_CH
-    Name = "gid_Module_Root_Extension_Dictionary_De_CH";
-    Description = "gid_Module_Root_Extension_Dictionary_De_CH";
-    Files = (gid_File_Extension_Dictionary_De_CH);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "de-CH";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_DE
-    Name = "gid_Module_Root_Extension_Dictionary_De_DE";
-    Description = "gid_Module_Root_Extension_Dictionary_De_DE";
-    Files = (gid_File_Extension_Dictionary_De_DE);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "de-DE";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_En
-	Name = "gid_Module_Root_Extension_Dictionary_En";
-	Description = "gid_Module_Root_Extension_Dictionary_En";
-	Files = (gid_File_Extension_Dictionary_En);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "en-US";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Es
-	Name = "gid_Module_Root_Extension_Dictionary_Es";
-	Description = "gid_Module_Root_Extension_Dictionary_Es";
-	Files = (gid_File_Extension_Dictionary_Es);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "es";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Et
-	Name = "gid_Module_Root_Extension_Dictionary_Et";
-	Description = "gid_Module_Root_Extension_Dictionary_Et";
-	Files = (gid_File_Extension_Dictionary_Et);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "et";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Fr
-	Name = "gid_Module_Root_Extension_Dictionary_Fr";
-	Description = "gid_Module_Root_Extension_Dictionary_Fr";
-	Files = (gid_File_Extension_Dictionary_Fr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "fr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Gl
-	Name = "gid_Module_Root_Extension_Dictionary_Gl";
-	Description = "gid_Module_Root_Extension_Dictionary_Gl";
-	Files = (gid_File_Extension_Dictionary_Gl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "gl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_He
-    Name = "gid_Module_Root_Extension_Dictionary_He";
-    Description = "gid_Module_Root_Extension_Dictionary_He";
-    Files = (gid_File_Extension_Dictionary_He);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "he";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Hu
-	Name = "gid_Module_Root_Extension_Dictionary_Hu";
-	Description = "gid_Module_Root_Extension_Dictionary_Hu";
-	Files = (gid_File_Extension_Dictionary_Hu);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "hu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_It
-	Name = "gid_Module_Root_Extension_Dictionary_It";
-	Description = "gid_Module_Root_Extension_Dictionary_It";
-	Files = (gid_File_Extension_Dictionary_It);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "it";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ku_Tr
-	Name = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
-	Description = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
-	Files = (gid_File_Extension_Dictionary_Ku_Tr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ku-TR";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Lt
-	Name = "gid_Module_Root_Extension_Dictionary_Lt";
-	Description = "gid_Module_Root_Extension_Dictionary_Lt";
-	Files = (gid_File_Extension_Dictionary_Lt);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "lt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ne
-	Name = "gid_Module_Root_Extension_Dictionary_Ne";
-	Description = "gid_Module_Root_Extension_Dictionary_Ne";
-	Files = (gid_File_Extension_Dictionary_Ne);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ne";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Nl
-	Name = "gid_Module_Root_Extension_Dictionary_Nl";
-	Description = "gid_Module_Root_Extension_Dictionary_Nl";
-	Files = (gid_File_Extension_Dictionary_Nl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "nl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_No
-    Name = "gid_Module_Root_Extension_Dictionary_No";
-    Description = "gid_Module_Root_Extension_Dictionary_No";
-    Files = (gid_File_Extension_Dictionary_No);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "no";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pl
-	Name = "gid_Module_Root_Extension_Dictionary_Pl";
-	Description = "gid_Module_Root_Extension_Dictionary_Pl";
-	Files = (gid_File_Extension_Dictionary_Pl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "pl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pt
-	Name = "gid_Module_Root_Extension_Dictionary_Pt";
-	Description = "gid_Module_Root_Extension_Dictionary_Pt";
-	Files = (gid_File_Extension_Dictionary_Pt);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "pt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ro
-    Name = "gid_Module_Root_Extension_Dictionary_Ro";
-    Description = "gid_Module_Root_Extension_Dictionary_Ro";
-    Files = (gid_File_Extension_Dictionary_Ro);
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "ro";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Root;
-    Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ru
-	Name = "gid_Module_Root_Extension_Dictionary_Ru";
-	Description = "gid_Module_Root_Extension_Dictionary_Ru";
-	Files = (gid_File_Extension_Dictionary_Ru);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "ru";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
 
-Module gid_Module_Root_Extension_Dictionary_Sk
-	Name = "gid_Module_Root_Extension_Dictionory_Sk";
-	Description = "gid_Module_Root_Extension_Dictionary_Sk";
-	Files = (gid_File_Extension_Dictionary_Sk);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sk";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sl
-	Name = "gid_Module_Root_Extension_Dictionary_Sl";
-	Description = "gid_Module_Root_Extension_Dictionary_Sl";
-	Files = (gid_File_Extension_Dictionary_Sl);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sr
-	Name = "gid_Module_Root_Extension_Dictionary_Sr";
-	Description = "gid_Module_Root_Extension_Dictionary_Sr";
-	Files = (gid_File_Extension_Dictionary_Sr);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sv
-	Name = "gid_Module_Root_Extension_Dictionary_Sv";
-	Description = "gid_Module_Root_Extension_Dictionary_Sv";
-	Files = (gid_File_Extension_Dictionary_Sv);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sv";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sw
-	Name = "gid_Module_Root_Extension_Dictionary_Sw";
-	Description = "gid_Module_Root_Extension_Dictionary_Sw";
-	Files = (gid_File_Extension_Dictionary_Sw);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "sw";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Th
-	Name = "gid_Module_Root_Extension_Dictionary_Th";
-	Description = "gid_Module_Root_Extension_Dictionary_Th";
-	Files = (gid_File_Extension_Dictionary_Th);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "th";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Vi
-	Name = "gid_Module_Root_Extension_Dictionary_Vi";
-	Description = "gid_Module_Root_Extension_Dictionary_Vi";
-	Files = (gid_File_Extension_Dictionary_Vi);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "vi";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Root_Extension_Dictionary_Zu
-	Name = "gid_Module_Root_Extension_Dictionary_Zu";
-	Description = "gid_Module_Root_Extension_Dictionary_Zu";
-	Files = (gid_File_Extension_Dictionary_Zu);
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "zu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-	Styles = (HIDDEN_ROOT);
-End
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index d77c05768fbb..dcd29c2ed31d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -49,3 +49,361 @@ Module gid_Module_Optional
     Sortkey = "200";
     MOD_NAME_DESC ( MODULE_OPTIONAL );
 End
+
+Module gid_Module_Dictionaries
+    ParentID = gid_Module_Optional;
+    Sortkey = "215";
+    MOD_NAME_DESC ( MODULE_DICTIONARIES );
+End
+
+Module gid_Module_Root_Extension_Dictionary_Af
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
+	Files = (gid_File_Extension_Dictionary_Af);
+	InstallOrder = "2000";
+    Sortkey = "510";
+	Spellcheckerlanguage = "af";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ca
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA );
+    Files = (gid_File_Extension_Dictionary_Ca);
+    InstallOrder = "2000";
+    Sortkey = "520";
+    Spellcheckerlanguage = "ca";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Cs
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
+	Files = (gid_File_Extension_Dictionary_Cs);
+	InstallOrder = "2000";
+    Sortkey = "530";
+	Spellcheckerlanguage = "cs";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Da
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
+	Files = (gid_File_Extension_Dictionary_Da);
+    Sortkey = "540";
+	InstallOrder = "2000";
+	Spellcheckerlanguage = "da";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_AT
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
+    Files = (gid_File_Extension_Dictionary_De_AT);
+	InstallOrder = "2000";
+    Sortkey = "570";
+    Spellcheckerlanguage = "de-AT";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_CH
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_CH );
+    Files = (gid_File_Extension_Dictionary_De_CH);
+    InstallOrder = "2000";
+    Sortkey = "580";
+    Spellcheckerlanguage = "de-CH";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De_DE
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_DE );
+    Files = (gid_File_Extension_Dictionary_De_DE);
+    InstallOrder = "2000";
+    Sortkey = "575";
+    Spellcheckerlanguage = "de-DE";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_En
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
+	Files = (gid_File_Extension_Dictionary_En);
+	InstallOrder = "2000";
+    Sortkey = "550";
+	Spellcheckerlanguage = "en-US";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Es
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
+	Files = (gid_File_Extension_Dictionary_Es);
+	InstallOrder = "2000";
+    Sortkey = "720";
+	Spellcheckerlanguage = "es";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Et
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
+	Files = (gid_File_Extension_Dictionary_Et);
+	InstallOrder = "2000";
+    Sortkey = "555";
+	Spellcheckerlanguage = "et";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Fr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
+	Files = (gid_File_Extension_Dictionary_Fr);
+	InstallOrder = "2000";
+    Sortkey = "560";
+	Spellcheckerlanguage = "fr";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Gl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
+	Files = (gid_File_Extension_Dictionary_Gl);
+	InstallOrder = "2000";
+    Sortkey = "565";
+	Spellcheckerlanguage = "gl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_He
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HE );
+    Files = (gid_File_Extension_Dictionary_He);
+    InstallOrder = "2000";
+    Sortkey = "590";
+    Spellcheckerlanguage = "he";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
+	Files = (gid_File_Extension_Dictionary_Hu);
+	InstallOrder = "2000";
+    Sortkey = "600";
+	Spellcheckerlanguage = "hu";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_It
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
+	Files = (gid_File_Extension_Dictionary_It);
+	InstallOrder = "2000";
+    Sortkey = "610";
+	Spellcheckerlanguage = "it";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ku_Tr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KU_TR );
+	Files = (gid_File_Extension_Dictionary_Ku_Tr);
+	InstallOrder = "2000";
+    Sortkey = "620";
+	Spellcheckerlanguage = "ku-TR";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Lt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
+	Files = (gid_File_Extension_Dictionary_Lt);
+	InstallOrder = "2000";
+    Sortkey = "630";
+	Spellcheckerlanguage = "lt";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ne
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
+	Files = (gid_File_Extension_Dictionary_Ne);
+	InstallOrder = "2000";
+    Sortkey = "640";
+	Spellcheckerlanguage = "ne";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Nl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
+	Files = (gid_File_Extension_Dictionary_Nl);
+	InstallOrder = "2000";
+    Sortkey = "545";
+	Spellcheckerlanguage = "nl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_No
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NO );
+    Files = (gid_File_Extension_Dictionary_No);
+    InstallOrder = "2000";
+    Sortkey = "650";
+    Spellcheckerlanguage = "no";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
+	Files = (gid_File_Extension_Dictionary_Pl);
+	InstallOrder = "2000";
+    Sortkey = "660";
+	Spellcheckerlanguage = "pl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT );
+	Files = (gid_File_Extension_Dictionary_Pt);
+	InstallOrder = "2000";
+    Sortkey = "515";
+	Spellcheckerlanguage = "pt";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ro
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RO );
+    Files = (gid_File_Extension_Dictionary_Ro);
+    InstallOrder = "2000";
+    Sortkey = "670";
+    Spellcheckerlanguage = "ro";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ru
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
+	Files = (gid_File_Extension_Dictionary_Ru);
+	InstallOrder = "2000";
+    Sortkey = "680";
+	Spellcheckerlanguage = "ru";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
+	Files = (gid_File_Extension_Dictionary_Sk);
+	InstallOrder = "2000";
+    Sortkey = "700";
+	Spellcheckerlanguage = "sk";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
+	Files = (gid_File_Extension_Dictionary_Sl);
+	InstallOrder = "2000";
+    Sortkey = "710";
+	Spellcheckerlanguage = "sl";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
+	Files = (gid_File_Extension_Dictionary_Sr);
+	InstallOrder = "2000";
+    Sortkey = "690";
+	Spellcheckerlanguage = "sr";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sv
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
+	Files = (gid_File_Extension_Dictionary_Sv);
+	InstallOrder = "2000";
+    Sortkey = "740";
+	Spellcheckerlanguage = "sv";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sw
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
+	Files = (gid_File_Extension_Dictionary_Sw);
+	InstallOrder = "2000";
+    Sortkey = "730";
+	Spellcheckerlanguage = "sw";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Th
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
+	Files = (gid_File_Extension_Dictionary_Th);
+	InstallOrder = "2000";
+    Sortkey = "750";
+	Spellcheckerlanguage = "th";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Vi
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
+	Files = (gid_File_Extension_Dictionary_Vi);
+	InstallOrder = "2000";
+    Sortkey = "760";
+	Spellcheckerlanguage = "vi";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Zu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
+	Files = (gid_File_Extension_Dictionary_Zu);
+	InstallOrder = "2000";
+    Sortkey = "770";
+	Spellcheckerlanguage = "zu";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Dictionaries;
+	Styles = ();
+End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 4660a2a442df..ee818ae4a82e 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -43,5 +43,200 @@ en-US = "Optional Components"
 [STR_DESC_MODULE_OPTIONAL]
 en-US = "Common components and additional programs shared by all %PRODUCTNAME programs."
 
+[STR_NAME_MODULE_DICTIONARIES]
+en-US = "Dictionaries"
 
+[STR_DESC_MODULE_DICTIONARIES]
+en-US = "Spelling and hyphenation dictionaries and thesauri."
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans spell checker"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Spelling and hyphenation dictionaries and thesaurus for Catalan language (general)"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Spelling and hyphenation dictionary for Danish"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_AT]
+en-US = "German (Austria)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_AT]
+en-US = "German (AT-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_CH]
+en-US = "German (Switzerland)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_CH]
+en-US = "German (CH-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_DE]
+en-US = "German (Germany)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_DE]
+en-US = "German (DE-frami) spelling, hyphenation, thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English spelling and hyphenation dictionaries and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician spellchecker dictionary for OpenOffice.org"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew spell check dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian spelling and hyphenation dictionaries and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KU_TR]
+en-US = "Kurdish (Turkey)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KU_TR]
+en-US = "Kurdish (Turkey) spell check dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali spelling dictionary and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish spell check dictionary, hyphenation rules and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT]
+en-US = "Brazilian Portuguese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT]
+en-US = "Brazilian Portuguese Spelling Dictionary - 1990 Spelling Agreement"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian Dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian hyphenation dictionary and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak spell check dictionary, hyphenation rules and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian dictionary pack"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian spelling and hyphenation dictionaries"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish Dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese spellchecker dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu hyphenation dictionary"
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index f02b5be04368..12ccef46c805 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Systemintegration
   #else
     PackageName = "";
   #endif
-	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250";
+	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
 End
 
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 7021f02efc4a..3cd20ef97142 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
   #else
     HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
   #endif
-    Styles = (OFFICEDIRECTORY);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
 End
 #endif
 
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index ebd0b87fbabd..9818d5b26749 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -173,6 +173,24 @@ End
 
 #endif
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "$BRAND_BASE_DIR/share/extensions";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -191,6 +209,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
     Value = "$UNO_SHARED_PACKAGES/cache";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -200,6 +227,15 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages
     Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "TMP_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
@@ -208,6 +244,14 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     Key = "UNO_USER_PACKAGES_CACHE";
     Value = "$UNO_USER_PACKAGES/cache";
 End
+ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "PKG_BundledUnoFile";
+    Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+End
 
 ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
     ProfileID = gid_Profile_Uno_Ini;
@@ -215,7 +259,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
     Section = "Bootstrap";
     Order = 5;
     Key = "PKG_SharedUnoFile";
-    Value = "$UNO_SHARED_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+    Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
 End
 
 ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
@@ -227,6 +271,22 @@ ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
     Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
+End
+
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -235,6 +295,14 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
     Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Extensions_User
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
     ModuleID = gid_Module_Root;
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -243,15 +311,23 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
     Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
 End
 
+ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Tmp_Extensions
+    ModuleID = gid_Module_Root;
+    ProfileID = gid_Profile_Fundamentalbasis_Ini;
+    Section = "Bootstrap";
+    Key = "TMP_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
     ModuleID = gid_Module_Root;
     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_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}";
+    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_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES}";
+    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
 
@@ -260,7 +336,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_SERVICES";
-    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
+    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
@@ -268,7 +344,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_JAVA_TYPES";
-    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
+    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 47a053f225cd..59ef1673d727 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -289,7 +289,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End
 
@@ -307,7 +307,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -325,7 +325,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (ALWAYS_REQUIRED);
 End
 
@@ -334,7 +334,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -343,7 +343,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End
 
@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 
@@ -370,7 +370,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -379,7 +379,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End
 
@@ -397,7 +397,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 2bf8db09254c..9aeaf32c5bcb 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -896,7 +896,7 @@ End
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("gcc_s", "1");
+    Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
 End
@@ -1273,5 +1273,5 @@ RegistryItem gid_Regitem_Path
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
     Name = "Path";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
 End
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index caa78335e509..5fad8fadcbba 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -46,6 +46,7 @@ Directory gid_Dir_Ooo_Openofficeorg
   #else
     HostName = "openoffice.org";
   #endif
+    Styles = (ISINSTALLLOCATION);
 End
 
 Directory gid_Dir_Common_Ure
@@ -105,21 +106,4 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
 	Styles = (ALWAYS_REQUIRED);
 End
 
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
 
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 70c490d954f8..0b71511c7f0e 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -29,32 +29,9 @@
 
 #if defined(WITH_VC_REDIST)
 
-// WindowsCustomAction gid_Customaction_InstallRuntime
-//	Name = "InstallRuntime";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
-// End
-
-// WindowsCustomAction gid_Customaction_InstallRuntime_X64
-//	Name = "InstallRuntimeX64";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x64.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
-// End
-
-
 ScpAction scp_Copy_vcredist_x86
   #if defined(BUILD_SPECIAL)
-    Copy = "vcredist_x86_9.0.21022.218.exe";
+    Copy = "vcredist_x86_9.0.30729.4148.exe";
   #else
     Copy = "vcredist_x86.exe";
   #endif
@@ -63,7 +40,11 @@ ScpAction scp_Copy_vcredist_x86
 End
 
 ScpAction scp_Copy_vcredist_x64
+  #if defined(BUILD_SPECIAL)
+    Copy = "vcredist_x64_9.0.30729.4148.exe";
+  #else
     Copy = "vcredist_x64.exe";
+  #endif
     Name = "vcredist_x64.exe";
     Subdir = "redist";
 End
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 9228b5cd711c..568b3996a8b7 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -199,16 +199,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
 End
 
-WindowsCustomAction gid_Customaction_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-End
-
 WindowsCustomAction gid_Customaction_Set_Admininstall
 	Name = "SetAdminInstallProperty";
 	Typ = "65";
@@ -218,27 +208,6 @@ WindowsCustomAction gid_Customaction_Set_Admininstall
 	Assignment1 = ("AdminExecuteSequence", "", "InstallInitialize");
 End
 
-/*
-WindowsCustomAction gid_Customaction_Remove_Extensions
-	Name = "RemoveExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RemoveExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "Shellextensionsdll4");
-End
-*/
-
-WindowsCustomAction gid_Customaction_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"\"", "gid_Customaction_Remove_Extensions");
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"\"", "behind_IsolateComponents");
-End
-
 WindowsCustomAction gid_Customaction_Check_Install_Directory
 	Name = "CheckInstallDirectory";
 	Typ = "65";
@@ -318,44 +287,6 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
 	Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
 End
 
-WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "end");
-	Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_Langpack_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "InstallInitialize");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "end");
-	Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Deregister_Extensions
-	Name = "DeregisterExtensions";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "DeregisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "InstallInitialize");
-End
-
 WindowsCustomAction gid_Customaction_Patch_SetFeatureState
 	Name = "SetFeatureState";
 	Typ = "65";
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 9794fa06719e..d47e14d0a63a 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -46,6 +46,14 @@ End
 
 #ifndef MACOSX
 
+#ifdef WNT
+Directory gid_Dir_Sdkoo_Root
+    ParentID = PREDEFINED_PROGDIR;
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+End
+#endif
+
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
     ParentID = PREDEFINED_PROGDIR;
@@ -77,7 +85,7 @@ Directory gid_Dir_Basis_Sdk
     DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
-    ParentID = PREDEFINED_PROGDIR;
+    ParentID = gid_Dir_Sdkoo_Root;
   #else
     ParentID = gid_Dir_Ooo_Basis_Sdk;
   #endif
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 76f389049580..72c209228849 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,6 +28,7 @@
 Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "900";
+    Default = NO;
     Language = "<LANGUAGE>";
     Assigns = gid_Module_Langpack_Binfilter_Template;
     Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 7c932bac1f28..62911d24fd0e 100755..100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -124,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -167,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -201,8 +201,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
     ComponentCondition = "VersionNT >= 600";
     Styles = (X64);
     Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 8c3f0a5b82ad..903a48af7d44 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1256,7 +1256,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
 
@@ -1265,7 +1265,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
 
@@ -1274,7 +1274,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
 
@@ -1365,7 +1365,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
 
@@ -1374,7 +1374,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
 
@@ -1446,7 +1446,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
 
@@ -1455,7 +1455,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
 
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index e044a3dee90d..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -57,7 +57,7 @@ End
 
 File gid_File_Xsl_Export_Xhtml_Body
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/body.xsl";
 End
author	sj <sj@openoffice.org>	2010-08-13 15:02:26 +0200
committer	sj <sj@openoffice.org>	2010-08-13 15:02:26 +0200
commit	3e05df357ef0c5c9274e03d43cea14967a158e38 (patch)
tree	7085d41dd595ac647da0698ab47e633a93dae359 /scp2
parent	10b609fdd5ce1e18be7b0ccbb3bb337039d30f2b (diff)
parent	d3087ee5d37ab92486d624c81e24ebda92bef26c (diff)