CWS-TOOLING: integrate CWS tkr27

2009-10-28 06:49:21 +0100 tkr  r277234 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-27 12:25:20 +0100 tkr  r277198 : #105418# rebase issue SYSSHELLLIB doesn't exist anymore
2009-10-26 08:06:52 +0100 tkr  r277172 : #105418# rename -lineon to -lneon for mingw port
2009-10-22 14:58:56 +0200 tkr  r277125 : #i105418# rename neon lib name
2009-10-22 14:56:48 +0200 tkr  r277123 : #i105418# rename neon lib name
2009-10-14 13:33:53 +0200 tkr  r276894 : #i105891# windows ifilter relocated
2009-10-12 12:12:43 +0200 tkr  r276826 : CWS-TOOLING: rebase CWS tkr27 to branches/OOO320@276773 (milestone: OOO320:m1)
2009-10-08 12:50:50 +0200 tkr  r276787 : #i105418# introduced new defines for special_lib_file
2009-10-08 12:48:08 +0200 tkr  r276786 : #i105418# build neon as shared library
2009-10-08 12:13:35 +0200 tkr  r276782 : #i105418# build neon as shared library
2009-09-29 12:46:16 +0200 tkr  r276523 : #i105418# build neon as shared library
2009-09-29 12:36:15 +0200 tkr  r276522 : #i105418# build neon as shared library
2009-09-29 12:17:21 +0200 tkr  r276519 : #i105418# build neon as shared library
2009-09-29 11:11:33 +0200 tkr  r276512 : #i105418# build neon as shared library
2009-09-29 10:39:19 +0200 tkr  r276509 : #i105418# build neon as shared library
2009-09-29 10:36:45 +0200 tkr  r276508 : #i105418# build neon as shared library

3 files changed, 3 insertions, 61 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1a28d5d71d9d..378fd1ac8ecb 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);
@@ -1560,7 +1546,8 @@ File gid_File_Lib_Ucpchelp1
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
 #endif
 
 SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 1d7e0f297148..0fbf2e2e1325 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -361,6 +361,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