diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-15 14:12:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-15 14:12:42 +0000 |
| commit | fe868574cc0f8247ff2c915c2957fac901f91be0 (patch) | |
| tree | 01af3d45c2c1d3455cba6b9925b0fe2c762fb14a /solenv/bin/modules/installer/scppatchsoname.pm | |
| parent | 7c3ffa7bd4e1437d7fd833956584ee6867833e3e (diff) | |
CWS-TOOLING: integrate CWS dv11
2009-05-13 16:50:24 +0200 dv r271863 : #i101829# Use UPGRADINGPRODUCTCODE to detect major upgrade
2009-04-17 15:55:48 +0200 dv r270953 : CWS-TOOLING: rebase CWS dv11 to trunk@270723 (milestone: DEV300:m46)
2009-04-17 09:14:21 +0200 dv r270916 : #i100915# Use better product name
2009-04-16 14:41:49 +0200 dv r270884 : #i101132# Use a waiting thread to defere update check
2009-04-07 15:46:52 +0200 dv r270599 : #i100915# Use one include file for all version.rc files
2009-04-07 13:49:56 +0200 dv r270596 : #i100915# Use one include file for all version.rc files
2009-04-03 09:04:08 +0200 dv r270447 : #100776# Added Microsoft XML file types to 'Default Applications', cleaned up Application name display in 'Default Applications'
2009-04-01 10:13:28 +0200 dv r270306 : #i100713# Remove instmsia.exe from installation set
2009-03-30 16:35:35 +0200 dv r270240 : CWS-TOOLING: rebase CWS dv11 to trunk@270033 (milestone: DEV300:m45)
2009-03-27 10:24:40 +0100 dv r270138 : #i100410# Show survey after deinstalling OpenOffice.org (Windows only)
2009-03-18 15:05:31 +0100 dv r269679 : #i98780# Use 'Desktop' folder only, if it exists
2009-03-17 11:19:47 +0100 dv r269581 : #i100082# Ignore updates with failed dependencies for automatic update check
2009-03-13 14:37:27 +0100 dv r269479 : #i100082# Use 'value' instead of 'name' to create error message
2009-03-13 10:14:48 +0100 dv r269460 : #i100082# Support better error message when extension manager update finds an incompatible update
Diffstat (limited to 'solenv/bin/modules/installer/scppatchsoname.pm')
| -rw-r--r-- | solenv/bin/modules/installer/scppatchsoname.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm index 7ade6dee9c80..5d445d92dc13 100644 --- a/solenv/bin/modules/installer/scppatchsoname.pm +++ b/solenv/bin/modules/installer/scppatchsoname.pm @@ -78,7 +78,7 @@ sub convert_to_unicode sub replace_productname_in_file { - my ($sourcepath, $destpath, $variableshashref) = @_; + my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_; my $onefile = installer::files::read_binary_file($sourcepath); @@ -87,6 +87,7 @@ sub replace_productname_in_file for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; } my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'}; + if ( $filedescription ne "" ) { $productname = $filedescription; } my $unicode_productname = convert_to_unicode($productname); change_length_of_string(\$unicode_productname, $replacestring); @@ -124,6 +125,7 @@ sub resolving_patchsoname_flag # Language specific subdirectory my $onelanguage = $onefile->{'specificlanguage'}; + my $filedescription = ""; if ($onelanguage eq "") { @@ -140,6 +142,8 @@ sub resolving_patchsoname_flag my $destinationpath = $replacedir . $onefilename; my $movepath = $destinationpath . ".orig"; + if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; } + # if (!(-f $destinationpath)) # do nothing if the file already exists # { @@ -148,7 +152,7 @@ sub resolving_patchsoname_flag if ( $copysuccess ) { # Now the file can be patch (binary!) - my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref); + my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription); if ($found == 0) { |