mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#100929 - Windows Installer: "ADDLOCAL=ALL" doesn't set all features

Browse Source 
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>
This commit is contained in:
Juergen Funk
2016-07-15 11:56:02 +02:00
committed by Thorsten Behrens
parent 299b937746
commit 0a76a41ae7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scp2/source/ooo/windowscustomaction_ooo.scp
View File

@@ -189,8 +189,8 @@ WindowsCustomAction gid_Customaction_SelectLanguage
Source = "sellangmsi.dll"; Source = "sellangmsi.dll";
Target = "SelectLanguage"; Target = "SelectLanguage";
Inbinarytable = 1; Inbinarytable = 1;
Assignment1 = ("InstallExecuteSequence", "NOT Installed", "MigrateFeatureStates"); Assignment1 = ("InstallExecuteSequence", "NOT Installed And ADDLOCAL=\"\"", "MigrateFeatureStates");
Assignment2 = ("InstallUISequence", "NOT Installed", "MigrateFeatureStates"); Assignment2 = ("InstallUISequence", "NOT Installed And ADDLOCAL=\"\"", "MigrateFeatureStates");
End End
WindowsCustomAction gid_Customaction_SortTree WindowsCustomAction gid_Customaction_SortTree