diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 09:24:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 09:24:51 +0000 |
| commit | 0653d8ba55131fe025cb1e7f914b872ca2f01486 (patch) | |
| tree | a35d05b656efdc6eca447b64a07fc1f06c10e86f /instsetoo_native | |
| parent | 2f4d5c35d405ce8e4a046921754b83de80788d9f (diff) | |
CWS-TOOLING: integrate CWS native210_DEV300
Diffstat (limited to 'instsetoo_native')
4 files changed, 6 insertions, 0 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf index 3e4864e84c91..29325b2bd42b 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf @@ -3,3 +3,6 @@ en-US = "A newer version of [ProductName] was found. To install an older versio [OOO_CUSTOMACTION_2] en-US = "The same version of this product is already installed." + +[OOO_CUSTOMACTION_3] +en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index e3bb73b9ed90..93411143a914 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -41,6 +41,7 @@ SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID] SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID] SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID] NewProductFound 19 OOO_CUSTOMACTION_1 +OldProductFound 19 OOO_CUSTOMACTION_3 SameProductFound 19 OOO_CUSTOMACTION_2 SetLanguageSelected 51 LANG_SELECTED 1 ResetLanguageSelected 51 LANG_SELECTED 0 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index dc528293b869..4626b220ec3f 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -58,6 +58,7 @@ MoveFiles 1900 MsiPublishAssemblies 3025 MsiUnpublishAssemblies 875 NewProductFound NEWPRODUCTS 110 +OldProductFound OLDPRODUCTSSAMEMAJOR And (VersionNT > 599) 115 PatchFiles 2000 ProcessComponents 800 PublishComponents 3000 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt index 135987f108d3..1ccec5fa5b0c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt @@ -15,6 +15,7 @@ LaunchConditions 50 MaintenanceWelcome Installed And Not RESUME And Not Preselected And Not PATCH 750 MigrateFeatureStates 600 NewProductFound NEWPRODUCTS 160 +OldProductFound OLDPRODUCTSSAMEMAJOR And (VersionNT > 599) 165 PatchWelcome Installed And PATCH And Not IS_MAJOR_UPGRADE 625 ResolveSource Not Installed And Not PATCH 525 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 300 |