summaryrefslogtreecommitdiffstats
path: root/instsetoo_native/inc_sdkoo
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_sdkoo
parentmoved LANGUAGE_DONTKNOW impl detection up (diff)
downloadcore-d5295408b1f69b8fd694dabca00e0a923c3e959f.tar.gz
core-d5295408b1f69b8fd694dabca00e0a923c3e959f.zip
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_sdkoo')
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt1
2 files changed, 2 insertions, 0 deletions
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
index e787b93830a5..04cde2ad4d29 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
@@ -6,3 +6,4 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+SetARPNoRemove 51 ARPNOREMOVE 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
index 1b416c090478..f62847a4b9ee 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
@@ -52,6 +52,7 @@ RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
ScheduleReboot ISSCHEDULEREBOOT 3125
SetARPInstallLocation 990
+SetARPNoRemove VersionNT < 600 995
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950