diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-03-04 16:56:53 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-04 16:56:53 +0100 |
| commit | 08e4a33966786b29550406fbd20ec8bb4f04d5b4 (patch) | |
| tree | 1b184355689670680ac48eeefb4144babc76bea9 /setup_native | |
| parent | bafef6a9e36380c7c75169e600632914fe099453 (diff) | |
| parent | 5b932053079c0ed73ea23fd802d5f2f7c291ec25 (diff) | |
Merge tag 'libreoffice-3.6.5.2' into suse-3.6
Tag libreoffice-3.6.5.2
Conflicts:
editeng/source/editeng/impedit3.cxx
instsetoo_native/util/openoffice.lst
oovbaapi/UnoApi_oovbaapi.mk
sc/source/filter/oox/workbookhelper.cxx
sc/source/ui/app/scmod.cxx
sc/source/ui/cctrl/checklistmenu.cxx
solenv/inc/minor.mk
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
writerfilter/source/dmapper/PropertyMap.cxx
Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/packinfo/spellchecker_selection.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setup_native/source/packinfo/spellchecker_selection.pl b/setup_native/source/packinfo/spellchecker_selection.pl index b30a843e4acd..87f7cc204dcb 100644 --- a/setup_native/source/packinfo/spellchecker_selection.pl +++ b/setup_native/source/packinfo/spellchecker_selection.pl @@ -27,8 +27,9 @@ while (<>) { @{$map{$lang}} = (); } else { @{$map{$lang}} = split(/,/, $dicts); - $max = max($max, scalar(@{$map{$lang}})); } + push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}}); + $max = max($max, scalar(@{$map{$lang}})); } ++$max; |