diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-02 20:34:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-02 22:23:50 +0200 |
| commit | 677670e46783084891db7405866a3bd1a652cfac (patch) | |
| tree | cac1d9bdcbf2d5b6426c16e848fdc53c10dfcdb2 /scp2 | |
| parent | 4bab1f2dea44e54b72096eba0f5bc7a0a71c5589 (diff) | |
setup_native, scp2: remove "regpatchactivex" MSI custom-action and lib
This was effectively omitted from the installation set since commit
26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to
the obsolete StarOffice patch mechanism.
Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/activex/module_activex.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/windowscustomaction_ooo.scp | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index fbcbaba58ff6..9e06ed208fb7 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -31,6 +31,5 @@ Module gid_Module_Optional_Activexcontrol ParentID = gid_Module_Optional; Files = (auto_activexbinarytable_ALL, auto_activex_ALL, - auto_activexwin64_ALL, - gid_File_Lib_Regpatchactivex_Msi); + auto_activexwin64_ALL); End diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 0abb30611337..056fba827004 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -142,15 +142,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2"); 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_CheckPatchList Name = "CheckPatchList"; Typ = "65"; |