summaryrefslogtreecommitdiff
path: root/scp2/source/ooo/windowscustomaction_ooo.scp
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-19 14:20:37 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-19 14:20:37 +0000
commit8a6d3b5ce6f1cb528d4270201d06ee055c4ebaf1 (patch)
tree7dbcf2de3c588de75ae94c9e830da1b05e539703 /scp2/source/ooo/windowscustomaction_ooo.scp
parent8893c204bd82521bb534a57b8790abac21b79e24 (diff)
CWS-TOOLING: integrate CWS native218
2009-02-05 15:43:50 +0100 is r267429 : #i98921# new jre6u12 2009-02-05 15:43:09 +0100 is r267428 : #i98921# new jre6u12 2009-01-30 12:16:37 +0100 is r267192 : #i98066# new process for different jres for Unix and Windows 2009-01-30 12:14:28 +0100 is r267191 : #i98066# Windows installation sets only get jre6i7 because of broken /qb 2009-01-23 18:12:43 +0100 is r266847 : #159080# fix problem in custom action position 2009-01-23 18:06:48 +0100 is r266845 : #159080# fix problem in custom action position 2009-01-23 18:05:45 +0100 is r266844 : #159080# fix problem in custom action position 2009-01-23 10:55:06 +0100 is r266794 : #158090# adding removere.idt to remove registry entries 2009-01-23 10:54:18 +0100 is r266791 : #158090# adding removere.idt to remove registry entries 2009-01-16 16:58:27 +0100 is r266436 : #158880# preparing msp hotfix after servicepack release 2009-01-16 16:25:00 +0100 is r266431 : #158880# preparing msp hotfix after servicepack release 2009-01-14 16:34:29 +0100 is r266317 : #i52744# rtl support for Java GUI Installer 2009-01-14 12:39:29 +0100 is r266284 : #i98066# jre6u11 for all products 2009-01-14 12:17:59 +0100 is r266279 : #i98062# jre always has to have the same name of the executable 2009-01-13 14:45:59 +0100 is r266224 : #i98026# copyright till 2009 2009-01-13 14:39:11 +0100 is r266223 : #i98026# copyright till 2009 2009-01-13 14:26:51 +0100 is r266221 : #i52744# right to left for windows installer 2009-01-13 11:23:26 +0100 is r266201 : #6777669# default language in nsis has to be English 2009-01-13 11:20:17 +0100 is r266200 : #i98021# using correct syntax for comments 2009-01-12 16:49:36 +0100 is r266168 : #i97715# fixing problem with rpm 4.6
Diffstat (limited to 'scp2/source/ooo/windowscustomaction_ooo.scp')
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 44130af0664c..dee822b90b7e 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -230,7 +230,7 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory
Source = "shlxtmsi.dll";
Target = "CheckInstallDirectory";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not Installed", "ExitInstallDirNotEmpty");
+ Assignment1 = ("InstallExecuteSequence", "Not Installed", "CheckVersions");
Assignment2 = ("ControlEvent", "SetupType", "Next", "DoAction", "CheckInstallDirectory", "_IsSetupTypeMin = \"Typical\" And Not Installed", "2");
Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
End