summaryrefslogtreecommitdiff
path: root/instsetoo_native/inc_ooohelppack
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-09-21 23:09:45 +0200
committerAndras Timar <andras.timar@collabora.com>2013-09-21 23:24:10 +0200
commitd5295408b1f69b8fd694dabca00e0a923c3e959f (patch)
tree95e30428e7f4527ffeb57d47ab7f3fe29bbcfaf2 /instsetoo_native/inc_ooohelppack
parent3acc0cc1e527d3389c329d36744da76b10c83be6 (diff)
fdo#58144 - disable the ARP 'Remove' button on Windows XP
Windows installer on Windows XP cannot display messages, when the installer database is encoded in UTF-8 and support for CTL languages is not installed. This patch is a workaround, it disables the 'Remove' button in Control Panel's Add or Remove Programs applet, so the user has to choose 'Change', and has to uninstall LibreOffice with the Wizard, which does not exhibit the problem. Initially this bug was not expected, when we changed the enconding from legacy codepages to UTF-8 - I would say irreversibly. Then the severity of the bug was underestimated, because usually uninstallation needs no user interaction, so it does not matter, if the text is unreadable. However, in some circumstances uninstallation needs to reboot the computer, and the user needs to understand the question, whether to reboot now or later. Change-Id: I7d6b4e82cbe4142d23c29313e43a90fa43944b2f
Diffstat (limited to 'instsetoo_native/inc_ooohelppack')
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt1
2 files changed, 2 insertions, 0 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 997515a9a62e..aaf07ca28d96 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -5,5 +5,6 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+SetARPNoRemove 51 ARPNOREMOVE 1
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 3d29abe02df0..b30ebc27d9f6 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -53,6 +53,7 @@ RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
SetARPInstallLocation 990
+SetARPNoRemove VersionNT < 600 995
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950