From 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 Mon Sep 17 00:00:00 2001
From: Juergen Funk <juergen.funk_ml@cib.de>
Date: Fri, 15 Jul 2016 11:56:02 +0200
Subject: 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@collabora.com>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
---
 scp2/source/ooo/windowscustomaction_ooo.scp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scp2')

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 056fba827004..dfafc1611a53 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
-- 
cgit