mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OOOVENDOR is redundant here, it is defined by configure

Browse Source 
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4
Reviewed-on: https://gerrit.libreoffice.org/19255
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Andras Timar 2015-10-08 20:19:36 +02:00
parent 7c5e7604e6
commit ec245e274b
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
instsetoo_native/util/openoffice.lst.in
View File

@ -30,7 +30,6 @@ Globals
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL 8 WINDOWSPATCHLEVEL 8
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
STARTCENTER_HIDE_EXTERNAL_LINKS 0 STARTCENTER_HIDE_EXTERNAL_LINKS 0
64BITPRODUCT @WINDOWS_X64@ 64BITPRODUCT @WINDOWS_X64@

1
solenv/bin/modules/installer/ziplist.pm
View File

@ -795,7 +795,6 @@ sub replace_variables_in_ziplist_variables
sub overwrite_branding sub overwrite_branding
{ {
my ($variableshashref) = @_; 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->{'PROGRESSBARCOLOR'} = $ENV{'PROGRESSBARCOLOR'} , if( defined $ENV{'PROGRESSBARCOLOR'} && $ENV{'PROGRESSBARCOLOR'} ne "" );
$variableshashref->{'PROGRESSSIZE'} = $ENV{'PROGRESSSIZE'} , if( defined $ENV{'PROGRESSSIZE'} && $ENV{'PROGRESSSIZE'} ne "" ); $variableshashref->{'PROGRESSSIZE'} = $ENV{'PROGRESSSIZE'} , if( defined $ENV{'PROGRESSSIZE'} && $ENV{'PROGRESSSIZE'} ne "" );
$variableshashref->{'PROGRESSPOSITION'} = $ENV{'PROGRESSPOSITION'} , if( defined $ENV{'PROGRESSPOSITION'} && $ENV{'PROGRESSPOSITION'} ne "" ); $variableshashref->{'PROGRESSPOSITION'} = $ENV{'PROGRESSPOSITION'} , if( defined $ENV{'PROGRESSPOSITION'} && $ENV{'PROGRESSPOSITION'} ne "" );