summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-12-07 16:07:15 +0100
committerKurt Zenker <kz@openoffice.org>2009-12-07 16:07:15 +0100
commitb9004a5787949ce59366143009d191ff76e73ee2 (patch)
tree7661b7d088b5e46db3b7fadef6a438c883bb677c /scp2
parent7af875440ff069601d4fc3f320c5ffc6d65f6f94 (diff)
masterfix: #i10000# merge issure fixed
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/winexplorerext/registryitem_winexplorerext.scp48
1 files changed, 1 insertions, 47 deletions
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 472b0998ee33..87084695ada0 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -184,50 +184,4 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
Val64 = "Apartment";
End
-// End registry entries for the PropertySheet handler
-
-// Begin registry items for the MS Indexing server filter component
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old: Value = "opendocument.org Filter";
- Value = "OpenDocument Format Filter";
- Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
- Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
- Name = "ThreadingModel";
- Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old: Value = "opendocument.org Persistent Handler";
- Value = "OpenDocument Format Persistent Handler";
- Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Root;
- Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
- Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-End
-
-// End registry items for the MS Indexing server filter component \ No newline at end of file
+// End registry entries for the PropertySheet handler \ No newline at end of file