From a4b88947e5a56f39e80f8edf85b2b384a4f22bb3 Mon Sep 17 00:00:00 2001 From: Juergen Funk Date: Thu, 29 Jun 2017 09:43:20 +0200 Subject: [PATCH] tdf#106931 - LibreOffice 5.3 installer doesn't honor UI_LANGS property The patch 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 disable the CustomAction "SelectLanguage" when the MSI-Property ADDLOCAL is set, This patch set the the CustomAction when the Property "UI_LANGS" is set, then the CustomAction execute Change-Id: I254a44909e32fb7969a6e9f71adf4659d376523c Reviewed-on: https://gerrit.libreoffice.org/39379 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- scp2/source/ooo/windowscustomaction_ooo.scp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index dfafc1611a53..39a0d52cbd54 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 And ADDLOCAL=\"\"", "MigrateFeatureStates"); - Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", "MigrateFeatureStates"); + Assignment1 = ("InstallExecuteSequence", "NOT Installed And (ADDLOCAL=\"\" Or NOT UI_LANGS=\"\")", "MigrateFeatureStates"); + Assignment2 = ("InstallUISequence", "NOT Installed And (ADDLOCAL=\"\" Or NOT UI_LANGS=\"\")", "MigrateFeatureStates"); End WindowsCustomAction gid_Customaction_SortTree