diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-26 13:27:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-26 13:27:42 +0000 |
| commit | 600deb5ea49d1842e2b1bf39405c310834f8594d (patch) | |
| tree | 074075f91a53c63470648be3c186be3287ceef3c /scp2/source/ooo/windowscustomaction_ooo.scp | |
| parent | 320c5b5912cf7f4cdd2fd0bc68d88611802305bf (diff) | |
INTEGRATION: CWS fwk37 (1.5.16); FILE MERGED
2006/04/05 15:11:52 mav 1.5.16.2: RESYNC: (1.5-1.6); FILE MERGED
2006/03/20 10:28:05 mav 1.5.16.1: #i59532# use new customaction for the patch
Diffstat (limited to 'scp2/source/ooo/windowscustomaction_ooo.scp')
| -rwxr-xr-x | scp2/source/ooo/windowscustomaction_ooo.scp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 031f8db2d207..3250ef57d766 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.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-04-19 15:06:29 $ + * last change: $Author: kz $ $Date: 2006-04-26 14:27:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -220,6 +220,15 @@ WindowsCustomAction gid_Customaction_RegCleanOld Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And Not ALLUSERS=\"\"", "end"); End +WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol + Name = "PatchActiveXControl"; + Typ = "65"; + Source = "regpatchactivex.dll"; + Target = "PatchActiveXControl"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3", "end"); +End + WindowsCustomAction gid_Customaction_Patch_SetProductInstallModeAction Name = "SetProductInstallModeAction"; Typ = "321"; |