[Libreoffice-commits] core.git: instsetoo_native/util solenv/bin

[Andras Timar]

 instsetoo_native/util/openoffice.lst.in |    1 -
 solenv/bin/modules/installer/ziplist.pm |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit ec245e274b56f3e541b0fe2f5aea8060e7c90b25
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 8 20:19:36 2015 +0200

    OOOVENDOR is redundant here, it is defined by configure
    
    Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4
    Reviewed-on: https://gerrit.libreoffice.org/19255
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b674929..5f51117 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 0c5eb2a..638d671 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 "" );