sb111: merged in DEV300_m70

2 files changed, 107 insertions, 7 deletions

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7ba2624edd76..d5b55133c63e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1882,6 +1882,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ca
+    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Name = "dict-ca.oxt";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Cs
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-cs.oxt";
@@ -1900,15 +1909,33 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De
+File gid_File_Extension_Dictionary_De_AT
 	Dir = gid_Brand_Dir_Share_Extension_Install;
-	Name = "dict-de.oxt";
+    Name = "dict-de-AT.oxt";
 	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_De_CH
+    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Name = "dict-de-CH.oxt";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_De_DE
+    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Name = "dict-de-DE.oxt";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-en.oxt";
@@ -2008,6 +2035,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_No
+    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Name = "dict-no.oxt";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pl.oxt";
@@ -2026,6 +2062,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ro
+    Dir = gid_Brand_Dir_Share_Extension_Install;
+    Name = "dict-ro.oxt";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ru
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-ru.oxt";
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f06d40b51119..04692770a444 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -815,6 +815,17 @@ Module gid_Module_Root_Extension_Dictionary_Af
 	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";
@@ -837,17 +848,39 @@ Module gid_Module_Root_Extension_Dictionary_Da
 	Styles = (HIDDEN_ROOT);
 End
 
-Module gid_Module_Root_Extension_Dictionary_De
-	Name = "gid_Module_Root_Extension_Dictionary_De";
-	Description = "gid_Module_Root_Extension_Dictionary_De";
-	Files = (gid_File_Extension_Dictionary_De);
+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";
+    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";
@@ -969,6 +1002,17 @@ Module gid_Module_Root_Extension_Dictionary_Nl
 	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";
@@ -991,6 +1035,17 @@ Module gid_Module_Root_Extension_Dictionary_Pt
 	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";