[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer/windows/feature.pm |   39 ------------------------
 1 file changed, 39 deletions(-)

New commits:
commit 08fef531b59412bd6a1ae4cf986c102994711127
Author: Andras Timar <atimar at suse.com>
Date:   Thu Sep 27 18:24:09 2012 +0200

    Revert "sorting additional language packs and dictionaries fdo#34479"
    
    This reverts commit f34252f647db9f5d274afb0b12bc897544236003.
    
    We sort these lists with a custom action, no need to sort them in
    Perl script. See 39bb77fd667

diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 80f7954..c22b864 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -426,45 +426,6 @@ sub create_feature_table
             }
         }
 
-        # Sorting names of language packs and dictionaries
-        my @tempfeaturetable;
-        my @langlist;
-        my @langpack;
-        my @dictlist;
-        my @sorteddictlist;
-        my @sortedlanglist;
-
-        foreach (@featuretable) {
-            if (/^gm_r_Extension_Dictionary_/) {
-                push (@dictlist, $_);
-            }
-            elsif (/^gm_Langpack_r_/) {
-                push (@langlist, $_);
-            }
-            elsif (/\tgm_Langpack_r_/) {
-                push (@langpack, $_);
-            }
-            else {
-                push (@tempfeaturetable, $_);
-            }
-        }
-
-        @sorteddictlist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @dictlist;
-        @sortedlanglist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @langlist;
-
-        @featuretable = (@tempfeaturetable, @sorteddictlist);
-
-        foreach (@sortedlanglist) {
-            my $sortedlanglistline = $_;
-            push (@featuretable, $sortedlanglistline);
-            foreach (@langpack) {
-                my $langpackline = $_;
-                if ( (split(/\t/, $langpackline))[1] eq (split(/\t/, $sortedlanglistline))[0] ) {
-                    push (@featuretable, $langpackline);
-                }
-            }
-        }
-
         # Saving the file
 
         my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage;