diff options
| author | Tobias Krause <tkr@openoffice.org> | 2010-01-27 08:42:12 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2010-01-27 08:42:12 +0100 |
| commit | 350ba7d3136fee45a8f2d5165098e867c94ab36d (patch) | |
| tree | 9e5f63bd2e328155000ca9aa7e5e5fdc1c039dc2 /scp2 | |
| parent | f7b65af3bd85d6a0ac87b4e2306167accd9ef50f (diff) | |
tkr32: #i106190# remove ooofiltproxy
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 15 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 2 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/registryitem_winexplorerext.scp | 4 |
3 files changed, 2 insertions, 19 deletions
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 3e7cac6396cb..e51b8945903a 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -42,13 +42,6 @@ File gid_File_Lib_OOoFilt Name = "ooofilt.dll"; End -File gid_File_Lib_OOoFiltProxy - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofiltproxy.dll"; -End - #ifdef BUILD_X64 File gid_File_Lib_OOoFilt64 @@ -59,14 +52,6 @@ File gid_File_Lib_OOoFilt64 ComponentCondition = "VersionNT64"; End -File gid_File_Lib_OOoFiltProxy64 - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofiltproxy_x64.dll"; - ComponentCondition = "VersionNT64"; -End - #endif File gid_File_Lib_Shlxthdl diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 605f5e61dd04..76dd4e5b209d 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -40,9 +40,7 @@ Module gid_Module_Optional_Winexplorerext Files = (gid_File_Lib_Shlxthdl, gid_File_Lib_Shlxthdl64, gid_File_Lib_OOoFilt, - gid_File_Lib_OOoFiltProxy, gid_File_Lib_OOoFilt64, - gid_File_Lib_OOoFiltProxy64, gid_File_Lib_Shlxthdl_Msvcr71, gid_File_Lib_Shlxtmsi, gid_File_Lib_Reg64, diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index 87084695ada0..b378f3db883e 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -127,8 +127,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; Styles = (X64); // Values: X64 / X64_ONLY - Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll"; - Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll"; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; End RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel |