instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt | 2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1 -
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit af2a4d96b3886df2f3fe9af8af480897d128b2ed
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Oct 23 01:19:13 2014 -0700
Better solution to the MSP REINSTALL problem
This reverts commit 13bf74072e416b28fe733ac97cfdcd31f6bfe0f0.
Details: SparkeShare/productivity.git/Product/MSP-patching.txt
Change-Id: Ie1a7edc4cfdaf72beb24e487572e315ef669e49f
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index a7683a7..3b37421a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -85,7 +85,7 @@ OutOfSpace Resume NewDialog CustomSetup ACTION
<> "ADMIN" 0
PatchWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 0
PatchWelcome Cancel SpawnDialog CancelSetup 1 1
PatchWelcome Next EndDialog Return 1 3
-PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1
+PatchWelcome Next Reinstall ALL PATCH 1
PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE=""
2
ReadyToInstall Back NewDialog FileTypeDialog Installed OR
_IsSetupTypeMin = "Custom" 2
ReadyToInstall Back NewDialog MaintenanceType Installed AND
_IsMaintenance = "Reinstall" 3
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index d4618cd..9372705 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -14,4 +14,3 @@ ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1
ResetApplicationSelected 51 APP_SELECTED 0
SetAdminInstallProperty 51 ADMININSTALL 1
-PatchInstall 51 REINSTALL ALL
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 4ffdb30..6dd5ede 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -15,7 +15,6 @@ FileCost 400
FindRelatedProducts NOT ISSETUPDRIVEN 100
InstallFiles 1950
InstallFinalize 3150
-PatchInstall PATCH 699
InstallInitialize 700
InstallODBC 2600
InstallServices VersionNT 2750
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
