From 955fd1c534c061b3b6992dfe034b62b46ee2e844 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Wed, 18 May 2022 10:28:01 +0200 Subject: tdf#149106 Remove RenamePrgFolder and RemovePrgFolder custom msi actions This duplicates MSI functionality - if a folder cannot be written, MSI should request a reboot automatically. See https://bugs.documentfoundation.org/show_bug.cgi?id=149106#c17 for details. Change-Id: I65f295ff6e3bb22afc616feb2ba529413f3e24c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134513 Reviewed-by: Mike Kaganski Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins --- scp2/source/ooo/windowscustomaction_ooo.scp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 116b437b1ed3..41b78daad13b 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -18,24 +18,6 @@ #include "macros.inc" -WindowsCustomAction gid_Customaction_RenamePrgFolder - Name = "RenamePrgFolder"; - Typ = "1"; - Source = "shlxtmsi.dll"; - Target = "RenamePrgFolder"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); -End - -WindowsCustomAction gid_Customaction_RemovePrgFolder - Name = "RemovePrgFolder"; - Typ = "1"; - Source = "shlxtmsi.dll"; - Target = "RemovePrgFolder"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end"); -End - WindowsCustomAction gid_Customaction_Regallmsdocdll Name = "Regallmsdocdll"; Typ = "65"; -- cgit