INTEGRATION: CWS ause043 (1.20.4); FILE MERGED

2006/05/15 15:51:21 hjs 1.20.4.2: RESYNC: (1.20-1.21); FILE MERGED
2005/10/31 16:56:04 hjs 1.20.4.1: #i56702# remove unneeded UNOTYPE definition

ucb/prj/build.lst

 uc ucb : unotools tools cppuhelper CURL:curl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi vos NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
-uc	ucb\unotypes			    nmake	-	all	uc_unotypes NULL
-uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_unotypes NULL
+uc	ucb\source\regexp		    nmake	-	all	uc_regexp NULL
 uc	ucb\source\core			    nmake	-	all	uc_core uc_regexp NULL
-uc	ucb\source\cacher		    nmake	-	all	uc_cacher uc_unotypes NULL
-uc	ucb\source\sorter		    nmake	-	all	uc_sorter uc_unotypes NULL
-uc	ucb\source\ucp\ftp		    nmake	-	all	uc_ftp uc_unotypes NULL
-uc	ucb\source\ucp\file		    nmake	-	all	uc_file uc_unotypes NULL
-uc	ucb\source\ucp\gvfs			nmake	- 	u 	uc_gvfs uc_unotypes NULL
-uc	ucb\source\ucp\hierarchy	nmake	-	all	uc_hierarchy uc_unotypes NULL
-uc	ucb\source\ucp\webdav		nmake	-	all	uc_webdav uc_unotypes NULL
-uc	ucb\source\ucp\package		nmake	-	all	uc_package uc_unotypes NULL
-uc	ucb\source\ucp\tdoc			nmake	-	all	uc_tdoc uc_unotypes NULL
-uc	ucb\source\ucp\expand		nmake	-	all	uc_expand uc_unotypes NULL
+uc	ucb\source\cacher		    nmake	-	all	uc_cacher NULL
+uc	ucb\source\sorter		    nmake	-	all	uc_sorter NULL
+uc	ucb\source\ucp\ftp		    nmake	-	all	uc_ftp NULL
+uc	ucb\source\ucp\file		    nmake	-	all	uc_file NULL
+uc	ucb\source\ucp\gvfs			nmake	- 	u 	uc_gvfs NULL
+uc	ucb\source\ucp\hierarchy	nmake	-	all	uc_hierarchy NULL
+uc	ucb\source\ucp\webdav		nmake	-	all	uc_webdav NULL
+uc	ucb\source\ucp\package		nmake	-	all	uc_package NULL
+uc	ucb\source\ucp\tdoc			nmake	-	all	uc_tdoc NULL
+uc	ucb\source\ucp\expand		nmake	-	all	uc_expand NULL