diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-12-02 12:12:51 +0100 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-12-02 12:12:51 +0100 |
commit | e064be8763f39215dc65dc5fd39e72a995c5e5cb (patch) | |
tree | fdfe18cd77eedcd0edb3c7507647c4e486c9557a /scp2/source/ooo | |
parent | 54b7697c664adf8e136fd7b124bf1c81d38106b9 (diff) | |
parent | da23564a52f5c0abd6f60ff60e16f1816c4cc9d9 (diff) |
CWS-TOOLING: integrate CWS tkr27_DEV300
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 14 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 | ||||
-rw-r--r-- | scp2/source/ooo/registryitem_ooo.scp | 46 |
3 files changed, 1 insertions, 60 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a49efd11958f..9d2001d07371 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1410,20 +1410,6 @@ End #ifdef WNT -File gid_File_Lib_OOoFilt - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "ooofilt.dll"; -End - -File gid_File_Lib_OOoFiltProxy - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "ooofiltproxy.dll"; -End - File gid_File_Lib_Instooofiltmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 9607c88b6e0c..a6e276b1cb07 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ucbhelper, gid_File_Lib_Ucpchelp1, gid_File_Lib_Ucpdav1, + gid_File_Lib_Neon, gid_File_Lib_Ucpfile1, gid_File_Lib_Ucpftp1, gid_File_Lib_Ucphier1, diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 4e34805e33ec..8acb15d4eeed 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -518,52 +518,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded Value = "<progpath>\program"; End -// 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\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 - // "OpenWith" Windows Registry keys for extensions supported by OOo // new oxt file extension for office extension packages |