diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-06-17 13:07:33 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-06-17 13:07:33 +0000 |
| commit | cac07274e1c22e02609affd5e99f497cdee765d8 (patch) | |
| tree | a47b0085a238c429ba35e17162565ec413a2b9e2 /solenv/bin/modules/installer/ziplist.pm | |
| parent | 44195e490a5393abecbbfc23b71154edfca98744 (diff) | |
INTEGRATION: CWS nativefixer10 (1.11.54); FILE MERGED
2005/06/17 13:43:24 is 1.11.54.1: #123298# different registryitems for Office, Patch and LangPack
Diffstat (limited to 'solenv/bin/modules/installer/ziplist.pm')
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 2129273d46e9..f734e59c80b5 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -2,9 +2,9 @@ # # $RCSfile: ziplist.pm,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: obo $ $Date: 2005-04-20 11:48:42 $ +# last change: $Author: rt $ $Date: 2005-06-17 14:07:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -776,6 +776,11 @@ sub add_variables_to_allvariableshashref { $variableshashref->{'LCPRODUCTEXTENSION'} = ""; } + + if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; } + elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; } + else { $variableshashref->{'PRODUCTADDON'} = ""; } + } 1; |