instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt | 1 +
instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt | 1 +
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1 +
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1 +
instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt | 1 +
instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt | 1 +
6 files changed, 6 insertions(+)
New commits:
commit d5295408b1f69b8fd694dabca00e0a923c3e959f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Sep 21 23:09:45 2013 +0200
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
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 997515a..aaf07ca 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 3d29abe..b30ebc2 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 d582840..9372705 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -5,6 +5,7 @@ ISInitAllUsers 307 ALLUSERS 1
setAllUsersProfile 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
setUserProfile 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
+SetARPNoRemove 51 ARPNOREMOVE 1
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
WrongWindowsVersion 19 OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 62cb174..6dd5ede 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 e787b93..04cde2a 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 1b416c0..f62847a 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
