[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - instsetoo_native/inc_openoffice

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 2 11:59:22 UTC 2018


 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e05033c0b6e58ce08dc463469ca454a5c3fdaef
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jul 30 14:46:41 2018 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Aug 2 13:58:58 2018 +0200

    tdf#118869: mark some properties secure to pass them to elevated install
    
    See also http://helpnet.flexerasoftware.com/installshield19helplib/helplibrary/ISBP10.htm
    
    Change-Id: I217d68f98af8e56874af6c071bb7fa7354b3e4b4
    Reviewed-on: https://gerrit.libreoffice.org/58326
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit ec9b18b75c193c914691a29d3eb78bd81961fced)
    Reviewed-on: https://gerrit.libreoffice.org/58338
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 253cd2e450ca9c004237cd0c21b5c7f2f1f70bf7)
    Reviewed-on: https://gerrit.libreoffice.org/58341
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 32ada67082b4..302c4f281279 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3	installs
 Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS
+SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS;WIN81S14;UCRT_DETECTED
 SetupType	Typical
 SELECT_WORD	0
 SELECT_EXCEL	0


More information about the Libreoffice-commits mailing list