summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorGerd Weiss <gm@openoffice.org>2007-05-10 10:07:11 +0000
committerGerd Weiss <gm@openoffice.org>2007-05-10 10:07:11 +0000
commit550403ba338881f021900bf2a60b163b39172480 (patch)
tree3613dccc8b454717c8090daa3088ecccd080ed27 /scp2
parent36c211df3002a1f01f6b5e64600efaa6430f9991 (diff)
INTEGRATION: CWS native82 (1.14.136); FILE MERGED
2007/03/28 10:54:13 dv 1.14.136.3: #i75394# Use only one Assignment1 line! 2007/03/27 11:49:44 dv 1.14.136.2: #i75394# Do check only when office is not installed 2007/03/26 14:19:49 dv 1.14.136.1: #i75394# New custom action for enhanced error checking
Diffstat (limited to 'scp2')
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp16
1 files changed, 14 insertions, 2 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ceb4ba63aa16..9f343ce36183 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: windowscustomaction_ooo.scp,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: vg $ $Date: 2006-11-01 13:54:03 $
+ * last change: $Author: gm $ $Date: 2007-05-10 11:07:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -370,3 +370,15 @@ WindowsCustomAction gid_Customaction_MigrateInstallPath
Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
End
+
+WindowsCustomAction gid_Customaction_CheckVersions
+ Name = "CheckVersions";
+ Typ = "321";
+ Source = "sn_tools.dll";
+ Target = "CheckVersions";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "NOT Installed", "NewProductFound");
+ Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
+End
+
+