[Libreoffice-commits] core.git: scp2/source

[Juergen Funk]

 scp2/source/ooo/windowscustomaction_ooo.scp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Fri Jul 15 11:56:02 2016 +0200

    tdf#100929 - Windows Installer: "ADDLOCAL=ALL" doesn't set all features
    
    The CustomAction "SelectLangauge" overrides the ADDLOCAL-switch.
    When ADDLOCAL is set, skip the CustomAction "SelectLanguage"
    
    Change-Id: I716349a0645e2f8dd193103b35028e493ca8e3a1
    Reviewed-on: https://gerrit.libreoffice.org/27230
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 056fba8..dfafc16 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
     Source = "sellangmsi.dll";
     Target = "SelectLanguage";
     Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "NOT Installed", "MigrateFeatureStates");
-    Assignment2 = ("InstallUISequence", "NOT Installed", "MigrateFeatureStates");
+    Assignment1 = ("InstallExecuteSequence", "NOT Installed And ADDLOCAL=\"\"", "MigrateFeatureStates");
+    Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", "MigrateFeatureStates");
 End
 
 WindowsCustomAction gid_Customaction_SortTree