INTEGRATION: CWS nativefixer5 (1.7.56); FILE MERGED

2005/03/30 10:18:23 is 1.7.56.1: #i20372# preparing Windows patch: soffice.exe not installed in language packs

1 files changed, 19 insertions, 1 deletions

diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index 4448a4d0e12d..7b1593106d3d 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -543,7 +543,7 @@ sub get_folderitem_showcmd
 
 sub create_shortcut_table
 {
-    my ($filesref, $linksref, $folderref, $folderitemsref, $dirref, $basedir, $languagesarrayref, $iconfilecollector) = @_;
+    my ($filesref, $linksref, $folderref, $folderitemsref, $dirref, $basedir, $languagesarrayref, $includepatharrayref, $iconfilecollector) = @_;
 
     for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
     {
@@ -661,6 +661,24 @@ sub create_shortcut_table
             }
         }
 
+        # For language packs the soffice.exe has to be included, even if it is not part of the product.
+        # Also as part of the ARP applet (no substitution needed for ProductName, because the file is not installed!)
+
+        if (( $onefile eq "" ) && ( $installer::globals::languagepack ))
+        {
+            my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$sofficefile, $includepatharrayref, 1);
+            if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon in language pack!", "create_shortcut_table"); }
+
+            if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
+            {
+                unshift(@{$iconfilecollector}, $$sourcepathref);
+                $installer::globals::sofficeiconadded = 1;
+            }
+
+            my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
+            push(@installer::globals::logfileinfo, $localinfoline);
+        }
+
         # Saving the file
 
         my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage;