fdo#50827 move language dependent wordlists to the appropriate dict pack

Change-Id: Ie60051b65834cdfc748d12a71089a683f3108335

extras/Module_extras.mk

@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\
 	CustomTarget_autocorr \
 	Package_fonts \
 	Package_newfiles \
+	Package_wordbook \
 	Zip_autocorr \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
@@ -38,7 +39,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Zip_tplwizletter \
 	Zip_tplwizreport \
 	Zip_tplwizstyles \
-	Zip_wordbook \
 ))
 
 ifeq ($(WITH_EXTRA_EXTENSIONS),YES)

extras/Zip_wordbook.mk → extras/Package_wordbook.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,wordbook,$(SRCDIR)/extras/source/wordbook))
+$(eval $(call gb_Package_Package,extras_wordbook,$(SRCDIR)/extras/source/wordbook))
 
-$(eval $(call gb_Zip_add_files,wordbook,\
+$(eval $(call gb_Package_add_files,extras_wordbook,pck,\
 	en-GB.dic \
 	en-US.dic \
 	sl.dic \

scp2/source/ooo/file_extra_ooo.scp

@@ -402,8 +402,28 @@ File gid_File_Extra_Webcast_Pl
 End
 
 File gid_File_Extra_Wordbook
+    Dir = gid_Dir_Wordbook;
+    PACKED_TXT_FILE_BODY;
+    Name = "technical.dic";
+End
+
+File gid_File_Extra_Wordbook_en_US
     Dir = gid_Dir_Wordbook;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "wordbook.zip";
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-US.dic";
+End
+
+File gid_File_Extra_Wordbook_en_GB
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-GB.dic";
+End
+
+File gid_File_Extra_Wordbook_sl
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "sl.dic";
 End

scp2/source/ooo/module_ooo.scp

@@ -189,7 +189,7 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_En
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
-    Files = (gid_File_Extension_Dictionary_En);
+    Files = (gid_File_Extension_Dictionary_En, gid_File_Extra_Wordbook_en_US, gid_File_Extra_Wordbook_en_GB);
     InstallOrder = "2000";
     Sortkey = "550";
     Spellcheckerlanguage = "en";
@@ -486,7 +486,7 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Sl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
-    Files = (gid_File_Extension_Dictionary_Sl);
+    Files = (gid_File_Extension_Dictionary_Sl, gid_File_Extra_Wordbook_sl);
     InstallOrder = "2000";
     Sortkey = "710";
     Spellcheckerlanguage = "sl";