diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-04-21 21:07:38 +0100 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-04-21 21:07:38 +0100 |
commit | 768dbe9433bea78667297f5749315b7785b48c6b (patch) | |
tree | 5eed6d3057db290449e9f653cee4bb75f35fc5af /scp2/source/ooo/windowscustomaction_ooo.scp | |
parent | f3c4d05528f91411ce0f4a14c7950c62b400cbcc (diff) | |
parent | a0de0def4a49a63c6675a622123b793da8b4c78d (diff) |
cmcfixes74: merge with DEV300 m75
Diffstat (limited to 'scp2/source/ooo/windowscustomaction_ooo.scp')
-rwxr-xr-x | scp2/source/ooo/windowscustomaction_ooo.scp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index b69082b05cd5..9228b5cd711c 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -51,7 +51,7 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll Source = "reg4allmsdoc.dll"; Target = "FindRegisteredExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize"); + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize"); End WindowsCustomAction gid_Customaction_Regactivexdll1 @@ -516,3 +516,21 @@ WindowsCustomAction gid_Customaction_ShowSurvey Inbinarytable = 1; Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end"); End + +WindowsCustomAction gid_Customaction_LookForRegisteredExtensions + Name = "LookForRegisteredExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "LookForRegisteredExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2"); +End + +WindowsCustomAction gid_Customaction_RegisterSomeExtensions + Name = "RegisterSomeExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "RegisterSomeExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1"); +End |