[Libreoffice-commits] .: Branch 'libreoffice-3-5' - setup_native/source solenv/bin

[Petr Mladek]

 setup_native/source/packinfo/spellchecker_selection.txt |    1 +
 solenv/bin/modules/installer/worker.pm                  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 78c43c0b9963038f3b23980ae0eea3a6128c412c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 12 09:45:32 2012 +0200

    pack "en" dictionary only with "en" langpacks
    
    it is in the main installation tarball anyway; it was put in langpacks
    that did not have its own dictionary from some strange reason
    
    Signed-off-by: Tomáš Chvátal <tchvatal at suse.cz>

diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 8a866a2..a2e10bb 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -21,6 +21,7 @@ de = "de,fr,it"
 el = "el"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
+en-ZA = "en,es,fr"
 es = "an,es,fr,pt"
 et = "et"
 fr = "fr,es"
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index a7da80f..83c8cd8 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2811,7 +2811,7 @@ sub set_spellcheckerlanguages
     {
         my $languagelist = "";
         if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; }
-        else { $languagelist = $spellcheckhash{'en-US'}; }  # defaulting to English
+        else { $languagelist = ""; }  # no dictionary unless defined in SPELLCHECKERFILE
 
         my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ",");
         foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; }