summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-04 09:10:23 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-04 09:10:23 +0000
commitc05bdf017d15d1ada61d0308108cda124c42a3c3 (patch)
treeca2f9ec1e2141fdce093b11f6c5adc1375c51383
parent794712b2146264fd0df33722a1a93b915942ff87 (diff)
INTEGRATION: CWS onlineupdate3 (1.8.54); FILE MERGED
2006/07/19 12:36:57 obr 1.8.54.3: RESYNC: (1.8-1.10); FILE MERGED 2006/07/14 10:03:57 is 1.8.54.2: #137960# online update feature in windows patch 2006/07/13 16:22:27 is 1.8.54.1: #137961# new online update feature
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp15
1 files changed, 12 insertions, 3 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index bfd4070a6fe5..a5c7a1d3f3fd 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.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: obo $ $Date: 2006-07-13 15:16:49 $
+ * last change: $Author: ihi $ $Date: 2006-08-04 10:10:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -249,13 +249,22 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
End
+WindowsCustomAction gid_Customaction_Patch_SetNewFeatureState
+ Name = "SetNewFeatureState";
+ Typ = "65";
+ Source = "patchmsi.dll";
+ Target = "SetNewFeatureState";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "Not Installed", "InstallValidate");
+End
+
WindowsCustomAction gid_Customaction_Patch_SetFeatureState
Name = "SetFeatureState";
Typ = "65";
Source = "patchmsi.dll";
Target = "SetFeatureState";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not Installed", "InstallValidate");
+ Assignment1 = ("InstallExecuteSequence", "Not Installed", "SetNewFeatureState");
End
WindowsCustomAction gid_Customaction_Patch_DeinstallExchangeFiles