[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo
Andras Timar
andras.timar at collabora.com
Fri Oct 4 05:37:12 PDT 2013
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 e41365b3657780170016a0bd3c13d6d665ac422c
Author: Andras Timar <andras.timar at 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
Reviewed-on: https://gerrit.libreoffice.org/6109
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
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 8df102c..3402975 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 3da59dc..c92b882 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
More information about the Libreoffice-commits
mailing list