summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/common_brand.scp230
-rw-r--r--[-rwxr-xr-x]scp2/source/ooo/file_ooo.scp134
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp350
-rw-r--r--scp2/source/ooo/module_ooo.scp359
-rw-r--r--scp2/source/ooo/module_ooo.ulf195
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp86
-rwxr-xr-xscp2/source/ooo/ure.scp2
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp69
8 files changed, 930 insertions, 495 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6558dd1a55ff..f505a886cba8 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,6 +79,8 @@ 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,
@@ -91,9 +92,11 @@ Module gid_Module_Root_Brand
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;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 81ee4eac2960..a600c135de01 100755..100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1870,288 +1870,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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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
@@ -2159,8 +2159,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/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a4ab3bfab762..19bdd6cc3c25 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -808,354 +808,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..5b1de3897f77 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -49,3 +49,362 @@ Module gid_Module_Optional
Sortkey = "200";
MOD_NAME_DESC ( MODULE_OPTIONAL );
End
+
+Module gid_Module_Dictionaries
+ ParentID = gid_Module_Root;
+ XPDParentID = "root";
+ Sortkey = "300";
+ 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/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/ure.scp b/scp2/source/ooo/ure.scp
index 22aba304c09e..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
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";