[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/feature.pm |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5f4fa9754f6bb55204d4381cdfea1606d61b13b5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Oct 12 10:00:51 2013 -0700

    fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.
    
    Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a
    Reviewed-on: https://gerrit.libreoffice.org/6233
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 602beaf..f360337 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -179,6 +179,7 @@ sub get_feature_attributes
     if ( $onefeature->{'ParentID'} ) { $parentgid = $onefeature->{'ParentID'}; }
 
     if (( $parentgid eq "" ) || ( $parentgid eq $installer::globals::rootmodulegid )) { $attributes = "8"; }
+    elsif ( get_feature_display($onefeature) eq "0" ) { $attributes = "26"; } # fdo#33798
     else { $attributes = "10"; }
 
     return $attributes