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

[Michael Meeks]

 solenv/bin/modules/installer/helppack.pm |   49 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

New commits:
commit 82a9306f889f0e735bdb873e583edda856b9c7a9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Dec 17 19:24:55 2010 +0100

    do not ingnore language specific help files

diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
index 17fcdad..21d2f04 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -50,40 +50,41 @@ sub select_help_items
     {
         my $oneitem = ${$itemsref}[$i];
 
-        my $ismultilingual = $oneitem->{'ismultilingual'};
-        
-        if (!($ismultilingual))
+        my $styles = "";
+        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
         {
             # Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
             # Files with style "HELPPACK" are only included into help packs.
             # Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
             # forced, because otherwise they not not be included into helppacks.
-            
-            my $styles = "";
-            if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-            
-            if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
-                    
-            next; 	# single language files are not included into help pack
-        }
 
-    if (0) {
-        my $specificlanguage = "";
-        if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-        
-        for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )	# iterating over all languages
-        {
-            my $onelanguage = ${$languagesarrayref}[$j];
-            my $locallang = $onelanguage;
-            $locallang =~ s/-/_/;
-            
-            if ( $specificlanguage eq $onelanguage )
+            my $ismultilingual = $oneitem->{'ismultilingual'};
+
+            if ($ismultilingual)
             {
-                push(@itemsarray, $oneitem); 	
+    	        my $specificlanguage = "";
+    	        if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
+
+    		for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )	# iterating over all languages
+                {
+                    my $onelanguage = ${$languagesarrayref}[$j];
+                    my $locallang = $onelanguage;
+                    $locallang =~ s/-/_/;
+
+                    if ( $specificlanguage eq $onelanguage )
+                    {
+            		push(@itemsarray, $oneitem); 	
+                    }
+                }
+            }
+            else
+            {
+                push(@itemsarray, $oneitem);
             }
         }
     }
-    }
 
     return \@itemsarray;
 }