diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-10-08 20:19:36 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-08 19:01:08 +0000 |
| commit | ec245e274b56f3e541b0fe2f5aea8060e7c90b25 (patch) | |
| tree | f9390b709dc0cf959fa252502b309a1db7009028 | |
| parent | blind fix for OSX (diff) | |
| download | core-ec245e274b56f3e541b0fe2f5aea8060e7c90b25.tar.gz core-ec245e274b56f3e541b0fe2f5aea8060e7c90b25.zip | |
OOOVENDOR is redundant here, it is defined by configure
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4
Reviewed-on: https://gerrit.libreoffice.org/19255
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index b67492936d13..5f511178a9c8 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -30,7 +30,6 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL 8 - OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 STARTCENTER_HIDE_EXTERNAL_LINKS 0 64BITPRODUCT @WINDOWS_X64@ diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 0c5eb2a23a50..638d6716dd95 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -795,7 +795,6 @@ sub replace_variables_in_ziplist_variables sub overwrite_branding { my ($variableshashref) = @_; - $variableshashref->{'OOOVENDOR'} = $ENV{'OOO_VENDOR'} , if( defined $ENV{'OOO_VENDOR'} && $ENV{'OOO_VENDOR'} ne "" ); $variableshashref->{'PROGRESSBARCOLOR'} = $ENV{'PROGRESSBARCOLOR'} , if( defined $ENV{'PROGRESSBARCOLOR'} && $ENV{'PROGRESSBARCOLOR'} ne "" ); $variableshashref->{'PROGRESSSIZE'} = $ENV{'PROGRESSSIZE'} , if( defined $ENV{'PROGRESSSIZE'} && $ENV{'PROGRESSSIZE'} ne "" ); $variableshashref->{'PROGRESSPOSITION'} = $ENV{'PROGRESSPOSITION'} , if( defined $ENV{'PROGRESSPOSITION'} && $ENV{'PROGRESSPOSITION'} ne "" ); |