diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-09-21 23:09:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-04 12:36:51 +0000 |
| commit | e41365b3657780170016a0bd3c13d6d665ac422c (patch) | |
| tree | 46fa40c827b437e6029e1b8221f6100229aee9af | |
| parent | 8c70fd938a001e30ea5e5562e9c49897df4ca026 (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
Reviewed-on: https://gerrit.libreoffice.org/6109
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
6 files changed, 6 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 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 8df102ca59f4..3402975b876a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -6,6 +6,7 @@ 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 SetLanguageSelected 51 LANG_SELECTED 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 3da59dca9939..c92b882f32d3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -54,6 +54,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 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 |