[Libreoffice-commits] .: Branch 'feature/vos-removal' - patches/dev300

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Mon Oct 25 14:55:37 PDT 2010


 patches/dev300/apply                        |   41 
 patches/dev300/vosremoval-cleanup.diff      | 7475 ----
 patches/dev300/vosremoval-macros.diff       | 1289 
 patches/dev300/vosremoval-module.diff       |  615 
 patches/dev300/vosremoval-mutex.diff        |51555 ----------------------------
 patches/dev300/vosremoval-pipe.diff         |  904 
 patches/dev300/vosremoval-process.diff      | 1982 -
 patches/dev300/vosremoval-reference.diff    |13044 -------
 patches/dev300/vosremoval-timer.diff        | 1368 
 patches/dev300/vosremoval-unused-stuff.diff | 1859 -
 patches/dev300/vosremoval-xception.diff     |  362 
 11 files changed, 1 insertion(+), 80493 deletions(-)

New commits:
commit af28ec76ccd063086f7f715abb4b2a29e2eaa3b2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 25 16:49:33 2010 -0500

    remove vos-removal related patches, as they are integrated now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 939539e..bc483ac 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -29,7 +29,7 @@ Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebia
 # Experimental sections
 Experimental: VBAUntested, ArkOnlyExperimental, \
 	      UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
-	      PostgreSQL, SELinux, VOSremoval, \
+	      PostgreSQL, SELinux, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
 	      KDE4Experimental, MinGW, CalcExperimental, \
 	      OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
@@ -1787,45 +1787,6 @@ unit-sc.diff
 # unittesting-more-sw.diff, thorsten
 
 
-[ VOSremoval ]
-
-# remove vos/process.hxx
-# FIXME: in vcl, ExtCommandLine was removed, and the osl_ calls were used.
-# Should we use the new salhelper::ExtCommandLine there, or should we remove
-# even salhelper::ExtCommandLine, and introduce the functionality where
-# needed?  (It's on one place only)
-vosremoval-process.diff
-
-# remove vos/ref*.hxx
-vosremoval-reference.diff
-
-# remove vos/mutex.hxx
-vosremoval-mutex.diff
-
-# remove vos/macros.hxx
-vosremoval-macros.diff
-
-# remove vos/xception.hxx
-vosremoval-xception.diff
-
-# remove vos/module.hxx
-vosremoval-module.diff
-
-# remove includes of non-existing/unused headers (vos/process.hxx,
-# vos/dynload.hxx, vos/object.hxx, vos/types.hxx, vos/runnable.hxx,
-# vos/thread.hxx)
-vosremoval-unused-stuff.diff
-
-# remove vos/pipe.hxx
-vosremoval-pipe.diff
-
-# remove vos/timer.hxx, introduce salhelper/timer.hxx
-vosremoval-timer.diff
-
-# removel VOSLIB from makefile.mk's
-vosremoval-cleanup.diff
-
-
 [ OxygenOfficePalettes ]
 palette-enhanced-arrow.diff
 palette-enhanced-color.diff
diff --git a/patches/dev300/vosremoval-cleanup.diff b/patches/dev300/vosremoval-cleanup.diff
deleted file mode 100644
index 1b9169c..0000000
--- a/patches/dev300/vosremoval-cleanup.diff
+++ /dev/null
@@ -1,7475 +0,0 @@
-diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
-index a30812a..e49f5bf 100644
---- UnoControls/source/base/makefile.mk
-+++ UnoControls/source/base/makefile.mk
-@@ -60,7 +60,6 @@ SLOFILES=		$(SLO)$/multiplexer.obj				\
- #		$(ONELIB)	 \
- #		$(USRLIB)	 \
- #		$(UNOLIB)	 \
--#		$(VOSLIB) 	 \
- #		$(OSLLIB) 	 \
- #		$(TOOLSLIB) 	 \
- #		$(RTLLIB)
-diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
-index 4fe6f71..ca17828 100644
---- UnoControls/util/makefile.mk
-+++ UnoControls/util/makefile.mk
-@@ -60,7 +60,6 @@ SHL1STDLIBS= \
- 		$(TOOLSLIB) \
- 		$(CPPUHELPERLIB) \
- 		$(CPPULIB) \
--		$(VOSLIB) \
- 		$(SALLIB)
- 
- SHL1DEPN=		makefile.mk
-diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk
-index a1dcee3..d82741d 100644
---- automation/source/mozillaserver/makefile.mk
-+++ automation/source/mozillaserver/makefile.mk
-@@ -117,7 +117,7 @@ UNOTYPES= \
- 
- #SHL1TARGET=iserverproxy
- #SHL1STDLIBS= \
--#		$(VOSLIB) $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
-+#		$(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
- #		$(CPPULIB)		\
- #		$(CPPUHELPERLIB)	\
- #		$(UNOLIB)	\
-diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
-index 510edac..f2bfe92 100644
---- automation/util/makefile.mk
-+++ automation/util/makefile.mk
-@@ -63,7 +63,6 @@ SHL1STDLIBS= \
- 			$(SVLLIB)       \
- 			$(VCLLIB) \
- 			$(BASICLIB) \
--			$(VOSLIB) \
- 			$(SALLIB) \
- 			$(CPPUHELPERLIB) \
- 			$(CPPULIB) \
-@@ -94,7 +93,6 @@ SHL2IMPLIB= isimplecm
- 
- SHL2STDLIBS= \
- 			$(TOOLSLIB) \
--			$(VOSLIB) \
- 			$(SALLIB)
- 
- 
-@@ -119,13 +117,11 @@ SHL3STDLIBS= \
- 			$(SVLLIB)       \
- 			$(VCLLIB) \
- 			$(BASICLIB) \
--			$(VOSLIB) \
- 			$(SALLIB) \
- 			$(CPPUHELPERLIB) \
- 			$(CPPULIB) \
- 			$(COMPHELPERLIB) \
-             $(SOTLIB) \
--            $(VOSLIB) \
-             $(SIMPLECMLIB)
- 
- 
-@@ -168,7 +164,6 @@ APP1STDLIBS+= \
- 			$(VCLLIB) \
- 			$(SALLIB) \
- 			$(SJLIB) \
--			$(VOSLIB) \
- 			$(UCBHELPERLIB) \
- 			$(COMPHELPERLIB) \
-             $(SOTLIB) \
-@@ -178,7 +173,7 @@ APP1STDLIBS+= \
- 
- .IF "$(GUI)"=="UNX"
- APP1STDLIBS+= \
--			$(VOSLIB) $(SALLIB) $(BASICLIB)
-+            $(SALLIB) $(BASICLIB)
- APP1STDLIBS+=$(CPPULIB)
- .ENDIF
- .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-@@ -238,10 +233,10 @@ APP3STDLIBS= \
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="MACOSX"
- APP3STDLIBS+= \
--			$(VOSLIB) $(SALLIB) $(LIBSTLPORT)
-+            $(SALLIB) $(LIBSTLPORT)
- .ELSE
- APP3STDLIBS+= \
--			$(VOSLIB) $(SALLIB)
-+            $(SALLIB)
- .ENDIF
- .ENDIF
- # $(AUTOMATIONLIB) is build in SHL1TARGET
-diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
-index 2fbf804..56435cd 100644
---- avmedia/util/makefile.mk
-+++ avmedia/util/makefile.mk
-@@ -62,7 +62,7 @@ LIB1FILES=\
- 
- SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=i$(TARGET)
--SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(SOTLIB) $(VOSLIB)
-+SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(SOTLIB)
- SHL1DEF=$(MISC)$/$(SHL1TARGET).def
- SHL1LIBS=$(SLB)$/$(TARGET).lib
- 
-diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
-index 1c949de..2e96eb3 100644
---- basegfx/test/makefile.mk
-+++ basegfx/test/makefile.mk
-@@ -58,7 +58,6 @@ SHL1TARGET= tests
- SHL1STDLIBS= 	\
- 				$(SALLIB)		 \
- 				$(BASEGFXLIB)	 \
--				$(VOSLIB)		 \
- 				$(CPPUHELPERLIB) \
- 				$(CPPULIB)		 \
- 				$(CPPUNITLIB)
-diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
-index e75e033..42c4d07 100644
---- basic/util/makefile.mk
-+++ basic/util/makefile.mk
-@@ -65,12 +65,10 @@ SHL1STDLIBS= \
- 			$(SVTOOLLIB) \
- 			$(SVLLIB)	\
- 			$(VCLLIB) \
--			$(VOSLIB) \
- 			$(SALLIB) \
- 			$(COMPHELPERLIB) \
- 			$(UNOTOOLSLIB) \
- 			$(SOTLIB) \
--			$(VOSLIB) \
- 		    $(XMLSCRIPTLIB)
- 
- .IF "$(SOLAR_JAVA)" != "TRUE"
-diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk
-index cd412b7..53d5720 100644
---- basic/workben/makefile.mk
-+++ basic/workben/makefile.mk
-@@ -58,15 +58,13 @@ APP1STDLIBS= \
- 			$(CPPUHELPERLIB) \
- 			$(CPPULIB) \
- 			$(SJLIB) \
--			$(SOTLIB) \
--			$(VOSLIB)
-+            $(SOTLIB)
- 
- #.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
- #APP1STDLIBS+=$(CPPULIB)
- #.ENDIF
- #.IF "$(GUI)"=="UNX"
- #APP1STDLIBS+= \
--#			$(VOSLIB) \
- #			$(SALLIB)
- #.ENDIF
- 
-diff --git a/binfilter/bf_basic/util/makefile.mk b/binfilter/bf_basic/util/makefile.mk
-index 56dff23..85d1444 100644
---- binfilter/bf_basic/util/makefile.mk
-+++ binfilter/bf_basic/util/makefile.mk
-@@ -63,12 +63,10 @@ SHL1STDLIBS= \
-             $(SVTOOLLIB) \
-             $(SVLLIB)   \
-             $(SVLIB) \
--            $(VOSLIB) \
-             $(SALLIB) \
-             $(COMPHELPERLIB) \
-             $(UNOTOOLSLIB) \
-             $(SOTLIB) \
--            $(VOSLIB) \
-             $(VCLLIB) \
-             $(XMLSCRIPTLIB)
- 
-diff --git a/binfilter/bf_forms/util/makefile.mk b/binfilter/bf_forms/util/makefile.mk
-index c9050b2..3092987 100644
---- binfilter/bf_forms/util/makefile.mk
-+++ binfilter/bf_forms/util/makefile.mk
-@@ -74,7 +74,6 @@ SHL1STDLIBS= \
- 		$(SVLLIB)	\
- 		$(BFSVXLIB) \
- 		$(LEGACYSMGRLIB)	\
--		$(VOSLIB) \
- 		$(UNOTOOLSLIB) \
- 		$(COMPHELPERLIB) \
- 		$(DBTOOLSLIB) \
-diff --git a/binfilter/bf_offmgr/util/makefile.mk b/binfilter/bf_offmgr/util/makefile.mk
-index 703690b..525ffc0 100644
---- binfilter/bf_offmgr/util/makefile.mk
-+++ binfilter/bf_offmgr/util/makefile.mk
-@@ -87,7 +87,6 @@ SHL2STDLIBS+= \
- 	$(COMPHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
-     $(SALLIB)
- 
- .IF "$(GUI)"=="WNT"
-diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
-index 43cf1c7..402adae 100644
---- binfilter/bf_sc/util/makefile.mk
-+++ binfilter/bf_sc/util/makefile.mk
-@@ -90,7 +90,6 @@ SHL1STDLIBS+=       \
- 	$(COMPHELPERLIB)	\
- 	$(UCBHELPERLIB)	\
- 	$(TKLIB)		\
--	$(VOSLIB)		\
- 	$(SALLIB)		\
- 	$(SALHELPERLIB)		\
- 	$(TOOLSLIB)		\
-diff --git a/binfilter/bf_sd/util/makefile.mk b/binfilter/bf_sd/util/makefile.mk
-index b824e28..4be9123 100644
---- binfilter/bf_sd/util/makefile.mk
-+++ binfilter/bf_sd/util/makefile.mk
-@@ -91,7 +91,6 @@ SHL1STDLIBS+= \
- 	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(SALLIB)
- 
- 
-diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
-index 58ebd5e..94de88c 100644
---- binfilter/bf_so3/util/makefile.mk
-+++ binfilter/bf_so3/util/makefile.mk
-@@ -81,7 +81,6 @@ SHL1STDLIBS=\
- 		$(SOTLIB) \
- 		$(UNOTOOLSLIB) \
- 		$(TOOLSLIB)	\
--		$(VOSLIB) \
- 		$(COMPHELPERLIB) \
- 		$(CPPUHELPERLIB) \
- 		$(CPPULIB) \
-diff --git a/binfilter/bf_svx/util/makefile.mk b/binfilter/bf_svx/util/makefile.mk
-index db3f8c4..0558a2d 100644
---- binfilter/bf_svx/util/makefile.mk
-+++ binfilter/bf_svx/util/makefile.mk
-@@ -76,7 +76,6 @@ SHL1STDLIBS= \
- 			$(UCBHELPERLIB) \
- 			$(CPPUHELPERLIB) \
- 			$(CPPULIB) \
--			$(VOSLIB) \
- 			$(SALLIB) \
- 			$(ICUUCLIB)\
- 			$(FWELIB) \
-diff --git a/binfilter/bf_sw/util/makefile.mk b/binfilter/bf_sw/util/makefile.mk
-index 58743bf..ce54b11 100644
---- binfilter/bf_sw/util/makefile.mk
-+++ binfilter/bf_sw/util/makefile.mk
-@@ -119,7 +119,6 @@ SHL2STDLIBS+= \
- 	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(SALLIB) \
- 	$(SALHELPERLIB) \
-     $(ICUUCLIB)
-diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
-index 6778f80..7f7dc52 100644
---- binfilter/bf_xmloff/util/makefile.mk
-+++ binfilter/bf_xmloff/util/makefile.mk
-@@ -75,7 +75,6 @@ SHL1STDLIBS= \
- 		$(SVTOOLLIB)	\
- 		$(TOOLSLIB)		\
- 		$(I18NISOLANGLIB) \
--		$(VOSLIB)		\
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)\
- 		$(COMPHELPERLIB)\
-diff --git a/binfilter/filter/source/bf_migrate/makefile.mk b/binfilter/filter/source/bf_migrate/makefile.mk
-index b986f02..404fb46 100644
---- binfilter/filter/source/bf_migrate/makefile.mk
-+++ binfilter/filter/source/bf_migrate/makefile.mk
-@@ -68,7 +68,6 @@ SHL1STDLIBS=$(CPPULIB)			\
- 			$(CPPUHELPERLIB)	\
- 			$(UNOTOOLSLIB)		\
- 			$(COMPHELPERLIB)	\
--			$(VOSLIB)			\
- 			$(SALLIB)			\
- 			$(VCLLIB)			\
- 			$(SVLLIB)			\
-diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk
-index 7061363..fd62164 100644
---- binfilter/filter/source/bf_offwrp/makefile.mk
-+++ binfilter/filter/source/bf_offwrp/makefile.mk
-@@ -71,7 +71,6 @@ SHL1STDLIBS=    \
- 				$(VCLLIB) 			\
- 				$(SOTLIB) 			\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(TOOLSLIB)			\
- 				$(CPPULIB)			\
- 				$(CPPUHELPERLIB)	\
-diff --git a/bridges/test/performance/makefile.mk b/bridges/test/performance/makefile.mk
-index 7b3345d..7f2c700 100644
---- bridges/test/performance/makefile.mk
-+++ bridges/test/performance/makefile.mk
-@@ -61,7 +61,6 @@ APP1STDLIBS+= -lstdc++
- APP1STDLIBS+=	\
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)	\
--			$(VOSLIB)	\
- 			$(SALLIB)
- 
- APP1DEF=	$(MISC)$/$(APP1TARGET).def
-diff --git a/chart2/workbench/addin/makefile.mk b/chart2/workbench/addin/makefile.mk
-index 4d1b003..2e4ddde 100644
---- chart2/workbench/addin/makefile.mk
-+++ chart2/workbench/addin/makefile.mk
-@@ -81,7 +81,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS= \
- 		$(CPPUHELPERLIB)	\
- 		$(CPPULIB)			\
--		$(VOSLIB)			\
- 		$(SALLIB) 
- 
- SHL1DEPN=makefile.mk
-diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
-index 9d44807..a38f999 100644
---- comphelper/prj/build.lst
-+++ comphelper/prj/build.lst
-@@ -1,4 +1,4 @@
--ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper NULL
-+ph	comphelper	:	cppuhelper ucbhelper offuh salhelper NULL
- ph	comphelper								usr1	-	all	ph_mkout NULL
- ph	comphelper\inc							nmake	-	all	ph_inc NULL
- ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
-diff --git a/comphelper/util/makefile.mk b/comphelper/util/makefile.mk
-index ac7d1b0..bc821ae 100644
---- comphelper/util/makefile.mk
-+++ comphelper/util/makefile.mk
-@@ -62,8 +62,7 @@ SHL1STDLIBS= \
- 	$(SALHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(UCBHELPERLIB) \
--	$(VOSLIB)
-+    $(UCBHELPERLIB)
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(COMPHLP_TARGET)
-diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
-index 35c8a1d..6364664 100644
---- configmgr/prj/build.lst
-+++ configmgr/prj/build.lst
-@@ -1,4 +1,4 @@
--cg	configmgr	:	offapi comphelper cppuhelper vos vcl NULL
-+cg	configmgr	:	offapi comphelper cppuhelper vcl NULL
- cg	configmgr								usr1	-	all	cg_mkout NULL
- cg	configmgr\inc							nmake	-	all	cg_inc NULL
- cg	configmgr\source\cmdtools				nmake	-	all	cg_cmdtools cg_misc cg_inc NULL
-diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk
-index 0ceee7d..2702173 100644
---- configmgr/util/makefile.mk
-+++ configmgr/util/makefile.mk
-@@ -53,7 +53,6 @@ SHL1STDLIBS=\
- 	$(COMPHELPERLIB)			\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALHELPERLIB)				\
- 	$(SALLIB)
- 
-diff --git a/configmgr/workben/apitest/makefile.mk b/configmgr/workben/apitest/makefile.mk
-index aeb48d8..0666b46 100644
---- configmgr/workben/apitest/makefile.mk
-+++ configmgr/workben/apitest/makefile.mk
-@@ -58,7 +58,6 @@ CDEFS += -DDLL_VERSION=$(EMQ)"$(UPD)$(DLLPOSTFIX)$(EMQ)"
- # ... common for all test executables ..............................
- APPSTDLIBS=\
- 			$(SALLIB) \
--            $(VOSLIB) \
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)
- 
-diff --git a/configmgr/workben/local_io/makefile.mk b/configmgr/workben/local_io/makefile.mk
-index 0d94d85..07ae0db 100644
---- configmgr/workben/local_io/makefile.mk
-+++ configmgr/workben/local_io/makefile.mk
-@@ -53,7 +53,6 @@ CDEFS += -DDLL_VERSION=$(EMQ)"$(UPD)$(DLLPOSTFIX)$(EMQ)"
- # ... common for all test executables ..............................
- APPSTDLIBS=\
- 			$(SALLIB) \
--         $(VOSLIB) \
- 			$(CPPULIB)	\
- 		$(UNOTOOLSLIB) \
- 			$(CPPUHELPERLIB) \
-diff --git a/configmgr/workben/memory/makefile.mk b/configmgr/workben/memory/makefile.mk
-index d94a7c2..b455e6f 100644
---- configmgr/workben/memory/makefile.mk
-+++ configmgr/workben/memory/makefile.mk
-@@ -54,7 +54,6 @@ CDEFS += -DDLL_VERSION=$(EMQ)"$(UPD)$(DLLPOSTFIX)$(EMQ)"
- # ... common for all test executables ..............................
- APPSTDLIBS=\
- 			$(SALLIB) \
--			$(VOSLIB) \
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)	\
- 			$(COMPHELPERLIB)	\
-diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
-index c7f7ee2..09309c9 100644
---- connectivity/source/cpool/makefile.mk
-+++ connectivity/source/cpool/makefile.mk
-@@ -69,7 +69,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(COMPHELPERLIB)			\
- 	$(DBTOOLSLIB)				\
- 	$(SALLIB)				\
-diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
-index 4be0233..9d4b091 100644
---- connectivity/source/dbtools/makefile.mk
-+++ connectivity/source/dbtools/makefile.mk
-@@ -64,7 +64,6 @@ SHL1TARGET=	$(DBTOOLS_TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(SALHELPERLIB)					\
- 	$(JVMACCESSLIB)				\
-diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
-index 4d944da..6d1412a 100644
---- connectivity/source/drivers/adabas/makefile.mk
-+++ connectivity/source/drivers/adabas/makefile.mk
-@@ -89,7 +89,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(SALHELPERLIB)					\
- 	$(DBTOOLSLIB)				\
-diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
-index a64d595..462b0ca 100644
---- connectivity/source/drivers/ado/makefile.mk
-+++ connectivity/source/drivers/ado/makefile.mk
-@@ -96,7 +96,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(OLE32LIB)					\
- 	$(OLEAUT32LIB)				\
-diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
-index d111ef6..01a0c11 100644
---- connectivity/source/drivers/calc/makefile.mk
-+++ connectivity/source/drivers/calc/makefile.mk
-@@ -73,7 +73,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(VCLLIB)					\
- 	$(TOOLSLIB)					\
-diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
-index 5c35ebe..3ef9c6b 100644
---- connectivity/source/drivers/dbase/makefile.mk
-+++ connectivity/source/drivers/dbase/makefile.mk
-@@ -104,7 +104,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(TOOLSLIB)					\
- 	$(SVTOOLLIB)				\
-diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
-index 60a98cb..0b42fd7 100644
---- connectivity/source/drivers/evoab/makefile.mk
-+++ connectivity/source/drivers/evoab/makefile.mk
-@@ -80,7 +80,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(VCLLIB)					\
- 	$(TOOLSLIB)					\
-diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
-index c3ec517..89587b2 100644
---- connectivity/source/drivers/evoab2/makefile.mk
-+++ connectivity/source/drivers/evoab2/makefile.mk
-@@ -86,7 +86,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(VCLLIB)					\
- 	$(TOOLSLIB)					\
-diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
-index 1370a17..5c76c16 100644
---- connectivity/source/drivers/file/makefile.mk
-+++ connectivity/source/drivers/file/makefile.mk
-@@ -80,7 +80,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(TOOLSLIB)					\
- 	$(SVTOOLLIB)				\
-diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
-index 3e18d39..3377e54 100644
---- connectivity/source/drivers/flat/makefile.mk
-+++ connectivity/source/drivers/flat/makefile.mk
-@@ -84,7 +84,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SVLLIB)					\
- 	$(VCLLIB)					\
- 	$(TOOLSLIB)					\
-diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
-index 5c52b3b..2ba33e1 100644
---- connectivity/source/drivers/hsqldb/makefile.mk
-+++ connectivity/source/drivers/hsqldb/makefile.mk
-@@ -99,7 +99,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(SALHELPERLIB)				\
- 	$(JVMACCESSLIB)				\
-diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
-index 4a97b47..d7e233e 100644
---- connectivity/source/drivers/jdbc/makefile.mk
-+++ connectivity/source/drivers/jdbc/makefile.mk
-@@ -93,7 +93,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(SALHELPERLIB)					\
- 	$(JVMACCESSLIB)				\
-diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
-index b3ba952..e706a48 100644
---- connectivity/source/drivers/kab/makefile.mk
-+++ connectivity/source/drivers/kab/makefile.mk
-@@ -112,7 +112,6 @@ SHL2OBJS=$(SLO2FILES)
- SHL2STDLIBS=\
-     $(CPPULIB)                  \
-     $(CPPUHELPERLIB)            \
--    $(VOSLIB)                   \
-     $(SALLIB)                   \
-     $(SALHELPERLIB)                   \
-     $(DBTOOLSLIB)               \
-diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
-old mode 100755
-new mode 100644
-index d401e5d..47af778
---- connectivity/source/drivers/macab/makefile.mk
-+++ connectivity/source/drivers/macab/makefile.mk
-@@ -112,7 +112,6 @@ SHL2OBJS=$(SLO2FILES)
- SHL2STDLIBS=\
-     $(CPPULIB)                  \
-     $(CPPUHELPERLIB)            \
--    $(VOSLIB)                   \
-     $(SALLIB)                   \
-     $(DBTOOLSLIB)               \
-     $(COMPHELPERLIB)            \
-diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
-index c8a0e58..c44b3b8 100644
---- connectivity/source/drivers/mozab/makefile.mk
-+++ connectivity/source/drivers/mozab/makefile.mk
-@@ -109,7 +109,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(DBTOOLSLIB)				\
- 	$(COMPHELPERLIB)
-@@ -172,7 +171,6 @@ SHL2OBJS=$(SLO2FILES)
- SHL2STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(DBTOOLSLIB)				\
- 	$(COMPHELPERLIB)			\
-diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
-index cf2add9..b0fce35 100644
---- connectivity/source/drivers/mysql/makefile.mk
-+++ connectivity/source/drivers/mysql/makefile.mk
-@@ -71,7 +71,6 @@ SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(DBTOOLSLIB)				\
- 	$(COMPHELPERLIB)            \
-diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
-index d08f371..bea3820 100644
---- connectivity/source/drivers/odbc/makefile.mk
-+++ connectivity/source/drivers/odbc/makefile.mk
-@@ -78,7 +78,6 @@ SHL1STDLIBS=\
- 	$(COMPHELPERLIB)			\
- 	$(CPPUHELPERLIB)			\
- 	$(CPPULIB)					\
--	$(VOSLIB)					\
- 	$(SALLIB)					\
- 	$(SALHELPERLIB)
- 
-diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
-index fd66702..1451611 100644
---- connectivity/source/manager/makefile.mk
-+++ connectivity/source/manager/makefile.mk
-@@ -66,7 +66,6 @@ SHL1STDLIBS=\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(COMPHELPERLIB)            \
--	$(VOSLIB)					\
- 	$(SALLIB)
- 
- SHL1DEPN=
-diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
-index 7588309..60fcafd 100644
---- connectivity/workben/iniParser/makefile.mk
-+++ connectivity/workben/iniParser/makefile.mk
-@@ -50,7 +50,6 @@ OBJFILES=       $(OBJ)$/main.obj
- 
- 
- APPSTDLIBS=$(SALLIB) \
--        $(VOSLIB) \
- 	$(CPPULIB)	\
- 	$(CPPUHELPERLIB)	\
- 	$(UCBHELPERLIB)	\
-diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
-index 95127e9..112b4ee 100644
---- connectivity/workben/little/makefile.mk
-+++ connectivity/workben/little/makefile.mk
-@@ -51,7 +51,6 @@ OBJFILES=       $(OBJ)$/main.obj
- APP1TARGET= $(TARGET)
- APP1OBJS=       $(OBJFILES)
- APPSTDLIBS=$(SALLIB) \
--            $(VOSLIB) \
- 			$(CPPULIB)	\
- 			$(CPPUHELPERLIB)	\
- 			$(SLB)$/sql.lib
-diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
-index 8ddaa93..f5f25ea 100644
---- connectivity/workben/testmoz/makefile.mk
-+++ connectivity/workben/testmoz/makefile.mk
-@@ -50,7 +50,6 @@ OBJFILES=       $(OBJ)$/main.obj
- 
- 
- APPSTDLIBS=$(SALLIB) \
--        $(VOSLIB) \
- 	$(CPPULIB)	\
- 	$(CPPUHELPERLIB)	\
- 	$(UCBHELPERLIB)	\
-diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
-index 7da9a2f..b41c864 100644
---- dbaccess/util/makefile.mk
-+++ dbaccess/util/makefile.mk
-@@ -72,7 +72,6 @@ SHL1STDLIBS= \
- 		$(UCBHELPERLIB) \
- 		$(SVLLIB)	\
- 		$(CPPULIB) \
--		$(VOSLIB) \
- 		$(SALLIB) \
-         $(SALHELPERLIB)
- 
-@@ -125,7 +124,6 @@ SHL2STDLIBS= \
- 		$(CPPUHELPERLIB)		\
- 		$(CPPULIB)				\
- 		$(SO2LIB)				\
--		$(VOSLIB)				\
- 		$(SALLIB)				\
- 		$(SALHELPERLIB)
- 
-diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
-index 5be3d9d..c30961e 100644
---- desktop/source/splash/makefile.mk
-+++ desktop/source/splash/makefile.mk
-@@ -73,7 +73,6 @@ SHL1STDLIBS= \
- 	$(COMPHELPERLIB)    \
-     $(UNOTOOLSLIB)		\
- 	$(TOOLSLIB)			\
--	$(VOSLIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
- 	$(SALLIB)
-diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
-index 4bbe6dd..574ff87 100644
---- desktop/unx/splash/makefile.mk
-+++ desktop/unx/splash/makefile.mk
-@@ -62,7 +62,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
- DEF1NAME=$(SHL1TARGET)
- 
- SHL1STDLIBS= \
--	$(VOSLIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
- 	$(SALLIB)
-diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
-index 390186b..a4c5055 100644
---- desktop/util/makefile.mk
-+++ desktop/util/makefile.mk
-@@ -104,9 +104,9 @@ LINKFLAGSAPPGUI!:=	$(LINKFLAGSAPPGUI:s/-bind_at_load//)
- ## winXX is handled like solaris for now
- #APP1_STDPRE=
- #APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \
--#	$(VOSLIB) $(SALLIB)
-+#	$(SALLIB)
- #.ELSE
--#APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \
-+#APP1_STDPRE=$(SALLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \
- #	$(CPPUHELPERLIB)
- #APP1_STDPOST=
- #.ENDIF
-@@ -128,7 +128,6 @@ APP1STDLIBS=			\
- 	$(I18NISOLANGLIB)   \
- 	$(COMPHELPERLIB)	\
- 	$(UCBHELPERLIB)		\
--	$(VOSLIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
-     $(TKLIB)            \
-@@ -173,7 +172,6 @@ APP5STDLIBS=			\
- 	$(I18NISOLANGLIB)   \
- 	$(COMPHELPERLIB)	\
- 	$(UCBHELPERLIB)		\
--	$(VOSLIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
- 	$(SALLIB)			\
-diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
-index 95d697d..fd97412 100644
---- dtrans/prj/build.lst
-+++ dtrans/prj/build.lst
-@@ -1,4 +1,4 @@
--dr	dtrans	:	unotools offapi offuh rdbmaker vos stoc NULL
-+dr	dtrans	:	unotools offapi offuh rdbmaker stoc NULL
- dr	dtrans									usr1	-	all	dr_mkout NULL
- dr	dtrans\inc								nmake	-	all	dr_inc NULL
- dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype dr_generic dr_inc NULL
-diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
-index fdcdf40..14f675d 100644
---- embeddedobj/source/msole/makefile.mk
-+++ embeddedobj/source/msole/makefile.mk
-@@ -100,7 +100,6 @@ SHL1OBJS= $(SLOFILES)
- 
- SHL1STDLIBS=\
- 	$(SALLIB)\
--	$(VOSLIB)\
- 	$(CPPULIB)\
- 	$(CPPUHELPERLIB)\
- 	$(COMPHELPERLIB)\
-diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst
-index aa93170..400b5a8 100644
---- eventattacher/prj/build.lst
-+++ eventattacher/prj/build.lst
-@@ -1,4 +1,4 @@
--ea      eventattacher   :       offapi cppuhelper vos NULL
-+ea      eventattacher   :       offapi cppuhelper NULL
- ea	eventattacher							usr1	-	all	ea_mkout NULL
- ea	eventattacher\prj						get		-	all	ea_prj NULL
- ea	eventattacher\source					nmake	-	all	ea_source NULL
-diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
-index 3f6018d..7c54c87 100644
---- extensions/source/nsplugin/source/makefile.mk
-+++ extensions/source/nsplugin/source/makefile.mk
-@@ -108,7 +108,6 @@ APP1STDLIBS=\
- 			$(CPPUHELPERLIB)	\
- 			$(UNOTOOLSLIB)		\
- 			$(COMPHELPERLIB)	\
--			$(VOSLIB)			\
- 			$(SALLIB)			\
- 			$(VCLLIB)			\
- 			$(SVLLIB)			\
-diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
-index a7554f3..45ced34 100644
---- extensions/source/ole/makefile.mk
-+++ extensions/source/ole/makefile.mk
-@@ -79,7 +79,6 @@ OWNGUIDCDEFS+= -DOWNGUID
- SHL1TARGET=$(TARGET)
- SHL1STDLIBS=\
-         $(SALLIB) 	\
--	$(VOSLIB)	\
- 	$(CPPULIB)	\
- 	$(CPPUHELPERLIB)	\
- 	$(OLE32LIB) 	\
-@@ -107,7 +106,6 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp
- SHL2TARGET=$(TARGET2)
- SHL2STDLIBS=\
-         $(SALLIB) 	\
--	$(VOSLIB)	\
- 	$(CPPULIB)	\
- 	$(CPPUHELPERLIB)	\
- 	$(OLE32LIB) 	\
-diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
-index 18daccc..3afc384 100644
---- extensions/source/plugin/aqua/makefile.mk
-+++ extensions/source/plugin/aqua/makefile.mk
-@@ -66,7 +66,6 @@ SLOFILES=\
- #APP1OBJS=$(OBJFILES)
- #APP1STDLIBS=\
- #	$(TOOLSLIB) 				\
--#	$(VOSLIB)					\
- #	$(SALLIB)
- 
- #APP1DEF=	$(MISC)$/$(TARGET).def
-diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
-index 7aed30b..e3463fc 100644
---- extensions/source/plugin/unx/makefile.mk
-+++ extensions/source/plugin/unx/makefile.mk
-@@ -78,7 +78,6 @@ APP1TARGET=pluginapp.bin
- APP1OBJS=$(OBJFILES)
- APP1STDLIBS=\
- 	$(TOOLSLIB) 				\
--	$(VOSLIB)					\
- 	$(SALLIB)
- .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
- APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
-diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
-index 6f3512f..eb53502 100644
---- extensions/source/plugin/util/makefile.mk
-+++ extensions/source/plugin/util/makefile.mk
-@@ -94,7 +94,6 @@ SHL1STDLIBS+= \
- 	$(VCLLIB)			\
- 	$(SVLLIB)			\
- 	$(TOOLSLIB)			\
--	$(VOSLIB)			\
- 	$(UCBHELPERLIB)		\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
-diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
-index 6c35014..a0c9d7b 100644
---- extensions/source/resource/makefile.mk
-+++ extensions/source/resource/makefile.mk
-@@ -59,7 +59,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB) 	 \
- 		$(SALLIB) 	 \
- 		$(VCLLIB)	\
- 		$(COMPHELPERLIB) \
-diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
-index 1f2903a..b4c3a32 100644
---- extensions/source/scanner/makefile.mk
-+++ extensions/source/scanner/makefile.mk
-@@ -78,7 +78,6 @@ SHL1STDLIBS=\
- 	$(CPPULIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(COMPHELPERLIB)	\
--	$(VOSLIB)			\
- 	$(SALLIB)			\
- 	$(ONELIB)			\
- 	$(TOOLSLIB)			\
-diff --git a/extensions/source/update/tools/makefile.mk b/extensions/source/update/tools/makefile.mk
-index cbfc483..847b09b 100644
---- extensions/source/update/tools/makefile.mk
-+++ extensions/source/update/tools/makefile.mk
-@@ -60,7 +60,7 @@ APP1STDLIBS = $(TOOLSLIB)
- #APP2TARGET = urltest
- #APP2OBJS = $(OBJ)$/urltest.obj
- #.IF "$(GUI)" == "UNX"
--#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-+#APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
- #.ELSE
- #APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib
- #.ENDIF
-diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk
-index 8b1aff3..17cbe26 100644
---- extensions/test/ole/cpnt/makefile.mk
-+++ extensions/test/ole/cpnt/makefile.mk
-@@ -67,7 +67,6 @@ SHL1TARGET= $(TARGET)
- 
- SHL1STDLIBS= \
- 		$(SALLIB)	\
--		$(VOSLIB)	\
- 		$(CPPULIB) 	\
- 		$(CPPUHELPERLIB)
- 
-diff --git a/extensions/test/sax/makefile.mk b/extensions/test/sax/makefile.mk
-index b76e9a8..94c9be7 100644
---- extensions/test/sax/makefile.mk
-+++ extensions/test/sax/makefile.mk
-@@ -54,7 +54,6 @@ LIB1OBJFILES=	$(OBJFILES)
- SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- 
- SHL1STDLIBS= \
--		$(VOSLIB) 	 \
- 		$(SALLIB) 	 \
- 		$(TOOLSLIB)	
- 
-diff --git a/extensions/test/stm/makefile.mk b/extensions/test/stm/makefile.mk
-index 583f849..0d14a6a 100644
---- extensions/test/stm/makefile.mk
-+++ extensions/test/stm/makefile.mk
-@@ -50,7 +50,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- LIB1TARGET= $(SLB)$/$(TARGET).lib	
- 
- SHL1STDLIBS= \
--		$(VOSLIB) 	 \
- 		$(SALLIB) 	 \
- 		$(TOOLSLIB)	
- 
-diff --git a/extensions/workben/makefile.mk b/extensions/workben/makefile.mk
-index cccd889..f73386c 100644
---- extensions/workben/makefile.mk
-+++ extensions/workben/makefile.mk
-@@ -91,7 +91,6 @@ APP1OBJS=	$(OBJFILES)
- APP1STDLIBS= \
- 			$(CPPUHELPERLIB)\
- 			$(CPPULIB)		\
--			$(VOSLIB)		\
- 			$(SALLIB)
- 
- .ENDIF # testpgp
-@@ -106,7 +105,6 @@ OBJFILES=	$(OBJ)$/testcomponent.obj
- APP2TARGET = testcomponent
- APP2OBJS   = $(OBJ)$/testcomponent.obj
- APP2STDLIBS = \
--              $(VOSLIB) \
-               $(TOOLSLIB)	\
-               $(SALLIB)
- 
-@@ -121,8 +119,7 @@ OBJFILES=	$(OBJ)$/pythontest.obj
- 
- #APP4TARGET=	pythontest
- #APP4OBJS=	$(OBJ)$/pythontest.obj 
--#APP4STDLIBS=$(TOOLSLIB)		\
--#			$(VOSLIB)
-+#APP4STDLIBS=$(TOOLSLIB)
- 
- .ENDIF # phytontest
- 
-@@ -135,8 +132,7 @@ OBJFILES=	$(OBJ)$/pythonautotest.obj
- 
- #APP5TARGET= pythonautotest
- #APP5OBJS = $(OBJ)$/pythonautotest.obj
--#APP5STDLIBS=$(TOOLSLIB)		\
--#			$(VOSLIB)
-+#APP5STDLIBS=$(TOOLSLIB)
- 
- .ENDIF # phytonautotest
- 
-@@ -170,7 +166,6 @@ OBJFILES=	$(OBJ)$/testframecontrol.obj
- APP3TARGET=	testframecontrol
- APP3OBJS=	$(OBJ)$/testframecontrol.obj
- APP3STDLIBS=$(TOOLSLIB)		\
--			$(VOSLIB)		\
- 			$(SVTOOLLIB)	\
- 			$(VCLLIB)
- 
-diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
-index 65138da..67028c9 100644
---- fileaccess/source/makefile.mk
-+++ fileaccess/source/makefile.mk
-@@ -60,7 +60,6 @@ DEF1NAME=$(SHL1TARGET)
- SHL1STDLIBS= \
-         $(UNOTOOLSLIB) \
- 		$(TOOLSLIB) \
--		$(VOSLIB) \
- 		$(UCBHELPERLIB) \
- 		$(CPPUHELPERLIB) \
- 		$(CPPULIB) \
-diff --git a/filter/source/xsltdialog/makefile.mk b/filter/source/xsltdialog/makefile.mk
-index 7dc0b2f..22a8197 100644
---- filter/source/xsltdialog/makefile.mk
-+++ filter/source/xsltdialog/makefile.mk
-@@ -85,7 +85,6 @@ SHL1STDLIBS=\
- 	$(CPPULIB)			\
- 	$(CPPUHELPERLIB)	\
- 	$(COMPHELPERLIB)	\
--	$(VOSLIB)			\
- 	$(SALLIB)			\
- 	$(TOOLSLIB)			\
- 	$(VCLLIB)			\
-diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
-index 3be188c..043e91a 100644
---- filter/source/xsltfilter/makefile.mk
-+++ filter/source/xsltfilter/makefile.mk
-@@ -60,7 +60,6 @@ SHL1STDLIBS= \
-     $(VCLLIB)           \
-     $(UNOTOOLSLIB)      \
-     $(TOOLSLIB)         \
--    $(VOSLIB)           \
-     $(CPPUHELPERLIB)    \
-     $(CPPULIB)          \
-     $(XMLOFFLIB) \
-diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
-index 685af20..970bb0c 100644
---- forms/util/makefile.mk
-+++ forms/util/makefile.mk
-@@ -71,7 +71,6 @@ SHL1STDLIBS= \
- 		$(SVLLIB)	\
- 		$(TKLIB) \
- 		$(SFX2LIB) \
--		$(VOSLIB) \
- 		$(UNOTOOLSLIB) \
- 		$(COMPHELPERLIB) \
- 		$(DBTOOLSLIB) \
-diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
-index 013f443..c2417c4 100644
---- fpicker/test/makefile.mk
-+++ fpicker/test/makefile.mk
-@@ -66,7 +66,6 @@ APP1STDLIBS=	$(CPPULIB)			\
- 				$(VCLLIB)			\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(SVLIB)  -l$(LB)/fps_office.uno.lib
- 
-diff --git a/framework/collector/makefile.mk b/framework/collector/makefile.mk
-index 27f4ebd..1e6b26d 100644
---- framework/collector/makefile.mk
-+++ framework/collector/makefile.mk
-@@ -52,7 +52,6 @@ APP1OBJS=		$(SLO)$/cmduicollector.obj
- 
- APP1STDLIBS=	\
- 				$(SALLIB)							\
--				$(VOSLIB)							\
- 				$(TOOLSLIB)                         \
- 				$(CPPULIB)                          \
- 				$(COMPHELPERLIB)					\
-diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
-index 2215e16..44ff95f 100644
---- framework/test/makefile.mk
-+++ framework/test/makefile.mk
-@@ -57,7 +57,6 @@ USE_DEFFILE=		TRUE
- #APP1STDLIBS=	$(CPPULIB)							\
- #				$(CPPUHELPERLIB)					\
- #				$(SALLIB)							\
--#				$(VOSLIB)							\
- #				$(TOOLSLIB) 						\
- #				$(SVTOOLLIB)						\
- #				$(TKLIB)							\
-@@ -85,7 +84,6 @@ DEPOBJFILES+= $(APP2OBJS)
- APP2STDLIBS=	$(CPPULIB)							\
- 				$(CPPUHELPERLIB)					\
- 				$(SALLIB)							\
--				$(VOSLIB)							\
- 				$(VCLLIB)
- 
- APP2DEPN=		$(SLO)$/fairrwlock.obj				\
-diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
-index 3b7cea0..ed36fe9 100644
---- framework/test/threadtest/makefile.mk
-+++ framework/test/threadtest/makefile.mk
-@@ -58,7 +58,6 @@ DEPOBJFILES=$(APP1OBJS)
- APP1STDLIBS=	$(CPPULIB)										\
- 				$(CPPUHELPERLIB)								\
- 				$(SALLIB)										\
--				$(VOSLIB)										\
- 				$(VCLLIB)
- 
- APP1DEPN=		$(INC)$/threadhelp$/threadhelpbase.hxx			\
-diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
-index e8dd17b..822d215 100644
---- framework/test/typecfg/makefile.mk
-+++ framework/test/typecfg/makefile.mk
-@@ -61,7 +61,6 @@ DEPOBJFILES=$(APP2OBJS)
- APP2STDLIBS=	$(CPPULIB)							\
- 				$(CPPUHELPERLIB)					\
- 				$(SALLIB)							\
--				$(VOSLIB)							\
- 				$(TOOLSLIB) 						\
- 				$(SVTOOLLIB)						\
- 				$(TKLIB)							\
-diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
-index 08aed6c..2c81e76 100644
---- framework/util/guiapps/makefile.mk
-+++ framework/util/guiapps/makefile.mk
-@@ -60,7 +60,6 @@ DEPOBJFILES=$(APP1OBJS)
- APP1STDLIBS=	$(CPPULIB)							\
- 				$(CPPUHELPERLIB)					\
- 				$(SALLIB)							\
--				$(VOSLIB)							\
- 				$(TOOLSLIB) 						\
- 				$(SVTOOLLIB)						\
- 				$(TKLIB)							\
-diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
-index 70230ea..cff13e8 100644
---- framework/util/makefile.mk
-+++ framework/util/makefile.mk
-@@ -120,7 +120,6 @@ SHL1STDLIBS=    \
-                 $(UNOTOOLSLIB)	    \
- 				$(CPPUHELPERLIB)	\
-                 $(TOOLSLIB)		    \
--                $(VOSLIB)		    \
-                 $(VCLLIB)		    \
- 				$(CPPULIB)		    \
-                 $(SALLIB)
-@@ -159,7 +158,6 @@ SHL2STDLIBS=    \
- 				$(COMPHELPERLIB)					\
- 				$(CPPUHELPERLIB)					\
- 				$(CPPULIB)							\
--				$(VOSLIB)							\
- 				$(SALLIB)
- 
- SHL2DEF=        $(MISC)$/$(SHL2TARGET).def
-@@ -191,7 +189,6 @@ SHL3STDLIBS=	\
- 				$(CPPUHELPERLIB)					\
- 				$(COMPHELPERLIB)					\
- 				$(CPPULIB)							\
--				$(VOSLIB)							\
- 				$(SALLIB)
- 
- SHL3DEF=        $(MISC)$/$(SHL3TARGET).def
-@@ -346,7 +343,6 @@ SHL4STDLIBS=	\
- 				$(COMPHELPERLIB)					\
- 				$(CPPUHELPERLIB)					\
- 				$(CPPULIB)							\
--				$(VOSLIB)							\
- 				$(SALLIB)					        \
- 				$(SALHELPERLIB)					        \
- 				$(UCBHELPERLIB)
-diff --git a/goodies/source/inv/makefile.mk b/goodies/source/inv/makefile.mk
-index 5981fc6..33c4fac 100644
---- goodies/source/inv/makefile.mk
-+++ goodies/source/inv/makefile.mk
-@@ -82,7 +82,6 @@ APP1STDLIBS=	$(CPPULIB)			\
- 				$(COMPHELPERLIB)	\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(VCLLIB)
- 
-diff --git a/goodies/util/makefile.mk b/goodies/util/makefile.mk
-index d362d17..7c3bc78 100644
---- goodies/util/makefile.mk
-+++ goodies/util/makefile.mk
-@@ -62,7 +62,6 @@ SHL1STDLIBS=\
- 		$(SVTOOLLIB)		\
- 		$(UNOTOOLSLIB)		\
- 		$(TOOLSLIB)			\
--		$(VOSLIB)			\
- 		$(SALLIB)			\
- 		$(CPPULIB) 			\
- 		$(COMPHELPERLIB) 	\
-diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-index 4981111..7f15632 100644
---- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-+++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-@@ -90,7 +90,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(SVTOOLLIB)	\
- 		$(SVLLIB)		\
-diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
-index 3898589..4d7c09f 100644
---- lingucomponent/source/spellcheck/macosxspell/makefile.mk
-+++ lingucomponent/source/spellcheck/macosxspell/makefile.mk
-@@ -67,7 +67,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(SVTOOLLIB)	\
- 		$(SVLLIB)		\
-diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
-index a1eb74a..b1da36e 100644
---- lingucomponent/source/spellcheck/spell/makefile.mk
-+++ lingucomponent/source/spellcheck/spell/makefile.mk
-@@ -90,7 +90,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(SVTOOLLIB)	\
- 		$(SVLLIB)		\
-diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
-index 91daddf..eb7cadf 100644
---- lingucomponent/source/thesaurus/libnth/makefile.mk
-+++ lingucomponent/source/thesaurus/libnth/makefile.mk
-@@ -109,7 +109,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(SVTOOLLIB)	\
- 		$(SVLLIB)		\
-diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
-index 41d9f7f..61b607e 100644
---- linguistic/source/makefile.mk
-+++ linguistic/source/makefile.mk
-@@ -73,7 +73,6 @@ SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
-         $(I18NUTILLIB)  \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(I18NISOLANGLIB) \
- 		$(SVTOOLLIB)	\
-diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
-index 9242b7c..37ca181 100644
---- linguistic/workben/makefile.mk
-+++ linguistic/workben/makefile.mk
-@@ -85,7 +85,6 @@ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- SHL1STDLIBS= \
- 		$(CPPULIB) 	 \
- 		$(CPPUHELPERLIB) 	 \
--		$(VOSLIB)		\
- 		$(TOOLSLIB)		\
- 		$(SVTOOLLIB)	\
- 		$(SVLLIB)		\
-diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
-index 5b2815f..93d46fb 100644
---- oox/util/makefile.mk
-+++ oox/util/makefile.mk
-@@ -63,7 +63,6 @@ SHL1IMPLIB= i$(SHL1TARGET)
- SHL1USE_EXPORTS=ordinal
- 
- SHL1STDLIBS= \
--		$(VOSLIB)		\
- 		$(CPPULIB)		\
- 		$(CPPUHELPERLIB)\
- 		$(COMPHELPERLIB)\
-diff --git a/remotebridges/examples/makefile.mk b/remotebridges/examples/makefile.mk
-index bb336ca..cea115d 100644
---- remotebridges/examples/makefile.mk
-+++ remotebridges/examples/makefile.mk
-@@ -51,7 +51,6 @@ SHL1TARGET= officeclientsample
- 
- SHL1STDLIBS= \
- 		$(SALLIB)	\
--		$(VOSLIB)	\
- 		$(CPPULIB) 	\
- 		$(CPPUHELPERLIB) 
- 
-diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
-index 020128c..4ce818a 100644
---- reportdesign/util/makefile.mk
-+++ reportdesign/util/makefile.mk
-@@ -73,7 +73,6 @@ SHL1STDLIBS= \
- 		$(CPPULIB)				\
- 		$(VCLLIB)				\
- 		$(TKLIB)				\
--		$(VOSLIB)				\
- 		$(SALLIB)
- .IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
- SHL1STDLIBS+= \
-diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
-index 4627645..98dd2e0 100644
---- rsc/source/prj/makefile.mk
-+++ rsc/source/prj/makefile.mk
-@@ -50,7 +50,7 @@ OBJFILES=   $(OBJ)$/gui.obj          \
-             $(OBJ)$/start.obj
- 
- APP1TARGET= rsc
--APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB)
-+APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB)
- APP1LIBS=   $(LB)$/rsctoo.lib
- APP1OBJS=   $(OBJ)$/start.obj
- .IF "$(GUI)" != "OS2"
-@@ -63,9 +63,9 @@ APP2TARGET= rsc2
- .IF "$(OS)"=="SCO"
- # SCO hat Probleme mit fork/exec und einigen shared libraries. 
- # rsc2 muss daher statisch gelinkt werden
--APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(VOSLIB) $(OSLLIB) $(RTLLIB) $(DYNAMIC)
-+APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(OSLLIB) $(RTLLIB) $(DYNAMIC)
- .ELSE
--APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) #RTLLIB)
-+APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) #RTLLIB)
- .ENDIF
- APP2LIBS=   $(LB)$/rsctoo.lib \
-             $(LB)$/rscres.lib \
-diff --git a/sax/util/makefile.mk b/sax/util/makefile.mk
-index 4122353..79c6a2a 100644
---- sax/util/makefile.mk
-+++ sax/util/makefile.mk
-@@ -58,7 +58,6 @@ SHL1USE_EXPORTS=ordinal
- 
- SHL1LIBS=	$(LIB1TARGET)
- SHL1STDLIBS= \
--				$(VOSLIB)		\
- 				$(CPPULIB)		\
- 				$(CPPUHELPERLIB)\
- 				$(COMPHELPERLIB)\
-diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
-index 0130b3c..2270594 100644
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -95,7 +95,6 @@ SHL1STDLIBS=       \
- 	$(COMPHELPERLIB)	\
- 	$(UCBHELPERLIB)	\
- 	$(TKLIB)		\
--	$(VOSLIB)		\
- 	$(SALLIB)		\
- 	$(SALHELPERLIB)		\
- 	$(TOOLSLIB)	\
-diff --git a/sc/workben/makefile.mk b/sc/workben/makefile.mk
-index 626239f..a629719 100644
---- sc/workben/makefile.mk
-+++ sc/workben/makefile.mk
-@@ -76,7 +76,7 @@ EXCEPTIONSFILES= \
- 
- SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
- 
--SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(SVLLIB) $(TKLIB) $(SALLIB) $(VOSLIB) $(CPPULIB) $(CPPUHELPERLIB)
-+SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(SVLLIB) $(TKLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
- 
- SHL1DEPN=   $(L)$/itools.lib $(SVLIBDEPEND)
- SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-diff --git a/scaddins/source/analysis/makefile.mk b/scaddins/source/analysis/makefile.mk
-index ad948b0..b311a84 100644
---- scaddins/source/analysis/makefile.mk
-+++ scaddins/source/analysis/makefile.mk
-@@ -114,7 +114,6 @@ SHL1STDLIBS= \
- 		$(TOOLSLIB)			\
- 		$(CPPUHELPERLIB)	\
- 		$(CPPULIB)			\
--		$(VOSLIB)			\
- 		$(SALLIB)
- 
- SHL1DEPN=makefile.mk
-diff --git a/scaddins/source/datefunc/makefile.mk b/scaddins/source/datefunc/makefile.mk
-index 71f3dfa..90ce770 100644
---- scaddins/source/datefunc/makefile.mk
-+++ scaddins/source/datefunc/makefile.mk
-@@ -101,7 +101,6 @@ SHL1STDLIBS= \
- 		$(TOOLSLIB)			\
- 		$(CPPUHELPERLIB)	\
- 		$(CPPULIB)			\
--		$(VOSLIB)			\
- 		$(SALLIB)
- 
- SHL1DEPN=makefile.mk
-diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
-index 1a9f94f..3f14d62 100644
---- sd/util/makefile.mk
-+++ sd/util/makefile.mk
-@@ -88,7 +88,6 @@ SHL1STDLIBS+= \
- 	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(CANVASLIB) \
- 	$(SALLIB) \
- 	$(SALHELPERLIB) \
-@@ -217,7 +216,6 @@ SHL4STDLIBS= \
- 	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(CANVASLIB) \
- 	$(SALLIB)
- # $(ISDLIB) is build in SHL1TARGET
-diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
-index 86bb526..cdac4aa 100644
---- sfx2/util/makefile.mk
-+++ sfx2/util/makefile.mk
-@@ -95,7 +95,6 @@ SHL1STDLIBS+=\
-         $(UCBHELPERLIB) \
- 		$(CPPUHELPERLIB) \
- 		$(CPPULIB) \
--		$(VOSLIB) \
- 		$(SALLIB) \
- 		$(SJLIB)
- 
-diff --git a/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk
-index 103e7a4..cb3a8c3 100644
---- svtools/bmpmaker/makefile.mk
-+++ svtools/bmpmaker/makefile.mk
-@@ -64,7 +64,6 @@ APP1TARGET= $(TARGET)
- APP1STDLIBS =		\
- 	$(VCLLIB)		\
- 	$(TOOLSLIB)		\
--	$(VOSLIB) 		\
- 	$(SALLIB)
- 
- APP1OBJS=   $(OBJ)$/bmp.obj			\
-@@ -80,7 +79,6 @@ APP2OBJS	=   $(OBJ)$/bmpsum.obj
- 
- APP2STDLIBS	=	$(VCLLIB)		\
- 				$(TOOLSLIB)		\
--				$(VOSLIB) 		\
- 				$(SALLIB)
- 
- # --- Targets ------------------------------------------------------
-diff --git a/svtools/source/config/test/makefile.mk b/svtools/source/config/test/makefile.mk
-index f548d77..a11464f 100644
---- svtools/source/config/test/makefile.mk
-+++ svtools/source/config/test/makefile.mk
-@@ -58,7 +58,6 @@ APP1STDLIBS=	$(CPPULIB)							\
- 				$(COMPHELPERLIB)					\
- 				$(UNOTOOLSLIB) 						\
- 				$(SALLIB)							\
--				$(VOSLIB)							\
- 				$(TOOLSLIB) 						\
- 				$(VCLLIB)
- 
-diff --git a/svtools/uno/makefile.mk b/svtools/uno/makefile.mk
-index 015f5b3..ef775ac 100644
---- svtools/uno/makefile.mk
-+++ svtools/uno/makefile.mk
-@@ -69,7 +69,6 @@ SHL1STDLIBS=\
- 	$(UNOTOOLSLIB) \
- 	$(TOOLSLIB) \
- 	$(COMPHELPERLIB) \
--	$(VOSLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
- 	$(SALLIB)
-diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
-index 8ed592e..c97747c 100644
---- svtools/util/makefile.mk
-+++ svtools/util/makefile.mk
-@@ -151,7 +151,6 @@ SHL1STDLIBS+= \
- 		$(COMPHELPERLIB)	\
- 		$(CPPUHELPERLIB)	\
- 		$(CPPULIB)			\
--		$(VOSLIB)			\
- 		$(SALLIB)			\
- 		$(SALHELPERLIB)			\
- 		$(ICUUCLIB)		\
-@@ -202,7 +201,6 @@ SHL2STDLIBS= \
- 		$(COMPHELPERLIB)	\
- 		$(CPPUHELPERLIB)	\
- 		$(CPPULIB)			\
--		$(VOSLIB)			\
- 		$(VCLLIB)			\
- 		$(SALLIB)
- 
-@@ -240,7 +238,6 @@ APP1STDLIBS+= -lsvl$(UPD)$(DLLPOSTFIX)
- APP1STDLIBS+=	\
- 				$(VCLLIB)		\
- 				$(TOOLSLIB)		\
--				$(VOSLIB) 		\
- 				$(SALLIB)
- 
- # --- g2g application --------------------------------------------------
-@@ -260,7 +257,6 @@ APP2STDLIBS+= -lsvl$(UPD)$(DLLPOSTFIX)
- 
- APP2STDLIBS+=	$(VCLLIB)		\
- 				$(TOOLSLIB)		\
--				$(VOSLIB) 		\
- 				$(SALLIB)
- 
- # --- Targets ------------------------------------------------------
-diff --git a/svtools/workben/cui/makefile.mk b/svtools/workben/cui/makefile.mk
-index bf332c9..533dc51 100644
---- svtools/workben/cui/makefile.mk
-+++ svtools/workben/cui/makefile.mk
-@@ -55,7 +55,6 @@ APP4STDLIBS= \
- 			$(SVLLIB) \
- 			$(VCLLIB) \
- 			$(TOOLSLIB) \
--			$(VOSLIB) \
- 			$(SALLIB)
- .IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
- APP4STDLIBS+= $(CPPULIB)
-diff --git a/svtools/workben/makefile.mk b/svtools/workben/makefile.mk
-index 75b5a2b..5d12b64 100644
---- svtools/workben/makefile.mk
-+++ svtools/workben/makefile.mk
-@@ -56,7 +56,6 @@ APP1STDLIBS=	$(SVTOOLLIB)		\
- 				$(COMPHELPERLIB) 	\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(CPPUHELPERLIB)	\
- 				$(CPPULIB)
- 
-diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
-index 85a4be6..52f3fdd 100644
---- svx/source/gengal/makefile.mk
-+++ svx/source/gengal/makefile.mk
-@@ -60,7 +60,6 @@ APP1TARGET= $(TARGET).bin
- APP1OBJS=   $(OBJFILES)
- 
- APP1STDLIBS=$(TOOLSLIB) 		\
--			$(VOSLIB)			\
- 			$(SO2LIB)			\
- 			$(SVTOOLLIB)		\
- 			$(SVLLIB)			\
-diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
-index 8781acb..cce9bdd 100644
---- svx/util/makefile.mk
-+++ svx/util/makefile.mk
-@@ -131,7 +131,6 @@ SHL1STDLIBS= \
- 			$(UCBHELPERLIB)	\
- 			$(CPPUHELPERLIB)	\
- 			$(CPPULIB) \
--            $(VOSLIB) \
-             $(SALLIB) \
-             $(SALHELPERLIB) \
-             $(ICUUCLIB)
-@@ -177,7 +176,6 @@ SHL2STDLIBS= \
- 			$(UCBHELPERLIB)	\
- 			$(CPPUHELPERLIB)	\
- 			$(CPPULIB) \
--            $(VOSLIB) \
-             $(SALLIB) \
-             $(JVMFWKLIB) \
-             $(ICUUCLIB)
-diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk
-index 5dacc6e..1518909 100644
---- svx/workben/makefile.mk
-+++ svx/workben/makefile.mk
-@@ -55,7 +55,6 @@ APP1TARGET= $(TARGET)
- APP1OBJS=	$(OBJFILES)
- APP1LIBS=	$(LB)$/svx.lib
- APP1STDLIBS=$(TOOLSLIB) 		\
--			$(VOSLIB)			\
- 			$(SO2LIB)			\
- 			$(SVTOOLLIB)		\
- 			$(SVLLIB)			\
-diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
-index 3f57220..af27896 100644
---- svx/workben/msview/makefile.mk
-+++ svx/workben/msview/makefile.mk
-@@ -66,7 +66,6 @@ APP1STDLIBS=	$(CPPULIB)			\
- 				$(TOOLSLIB) 		\
- 				$(SVTOOLLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(VCLLIB)			\
- 				$(SVXLIB)			\
-diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
-index b673a65..a4572c8 100644
---- sw/util/makefile.mk
-+++ sw/util/makefile.mk
-@@ -123,7 +123,6 @@ SHL1STDLIBS+= \
- 	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(SALLIB) \
- 	$(SALHELPERLIB) \
-     $(ICUUCLIB) \
-diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
-index 2d503fd..d20b711 100644
---- toolkit/util/makefile.mk
-+++ toolkit/util/makefile.mk
-@@ -64,7 +64,6 @@ SHL1IMPLIB= itk
- SHL1USE_EXPORTS=ordinal
- 
- SHL1STDLIBS=\
--		$(VOSLIB)           \
- 		$(VCLLIB)			\
- 		$(SOTLIB)			\
- 		$(UNOTOOLSLIB)		\
-diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk
-index 407231e..913fea1 100644
---- tools/bootstrp/addexes2/makefile.mk
-+++ tools/bootstrp/addexes2/makefile.mk
-@@ -47,7 +47,7 @@ TARGETTYPE=CUI
- 
- APP1TARGET=	mkunroll
- APP1OBJS=   $(OBJ)$/mkfilt.obj
--APP1STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) 
-+APP1STDLIBS= $(SALLIB) $(TOOLSLIB) 
- .IF "$(OS)"=="LINUX"
- APP1STDLIBS+=-lpthread
- .ENDIF
-diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
-index 89d657f..061376a 100644
---- tools/bootstrp/makefile.mk
-+++ tools/bootstrp/makefile.mk
-@@ -85,12 +85,12 @@ LIB2OBJFILES=\
- APP1TARGET= sspretty
- APP1OBJS=   $(OBJ)$/sspretty.obj
- APP1LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
--APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB)
-+APP1STDLIBS=$(SALLIB) $(TOOLSLIB)
- 
- APP2TARGET= rscdep
- APP2OBJS=	$(OBJ)$/rscdep.obj
- APP2LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
--APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB)
-+APP2STDLIBS= $(SALLIB) $(TOOLSLIB)
- 
- APP3TARGET=  so_checksum
- APP3OBJS=    $(OBJ)$/md5.obj \
-diff --git a/tools/prj/build.lst b/tools/prj/build.lst
-index e87e6f8..5e41bc7 100644
---- tools/prj/build.lst
-+++ tools/prj/build.lst
-@@ -1,4 +1,4 @@
--tl	tools	:	cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
-+tl	tools	:	cppu external offuh ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
- tl	tools								usr1	-	all	tl_mkout NULL
- tl	tools\bootstrp\isdll				get		-	all	tl_bsisdll NULL
- tl	tools\bootstrp\addexes				get		-	all	tl_bsexes NULL
-diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk
-index d4a9a94..d31e538 100644
---- tools/util/makefile.mk
-+++ tools/util/makefile.mk
-@@ -117,7 +117,7 @@ SHL1LIBS=       $(LIB1TARGET)
- SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
- SHL1IMPLIB=     itools
- SHL1USE_EXPORTS=ordinal
--SHL1STDLIBS+=   $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
-+SHL1STDLIBS+=   $(SALLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
- 
- .IF "$(WITH_LIBART)"=="YES"
- SHL1STDLIBS+=   $(LIBART_LIBS)
-diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk
-index ba78ce9..cae9bc3 100644
---- tools/workben/makefile.mk
-+++ tools/workben/makefile.mk
-@@ -61,9 +61,9 @@ APP1LIBS = $(LB)$/itools.lib
- APP2TARGET = urltest
- APP2OBJS = $(OBJ)$/urltest.obj
- .IF "$(GUI)" == "UNX"
--APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-+APP2STDLIBS = $(TOOLSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
- .ELSE
--APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-+APP2STDLIBS = $(LB)$/itools.lib $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
- .ENDIF
- 
- APP3TARGET = inetmimetest
-@@ -81,17 +81,17 @@ APP3STDLIBS = $(SALLIB) $(TOOLSLIB)
- # APP4TARGET = demostor
- # APP4OBJS = $(OBJ)$/demostor.obj
- # .IF "$(GUI)" == "UNX"
--# APP4STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-+# APP4STDLIBS = $(TOOLSLIB) $(SALLIB)
- # .ELSE
--# APP4STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-+# APP4STDLIBS = $(LB)$/itools.lib $(SALLIB)
- # .ENDIF
- 
- # APP5TARGET = fstest
- # APP5OBJS = $(OBJ)$/fstest.obj
- # .IF "$(GUI)" == "UNX"
--# APP5STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-+# APP5STDLIBS = $(TOOLSLIB) $(SALLIB)
- # .ELSE
--# APP5STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-+# APP5STDLIBS = $(LB)$/itools.lib $(SALLIB)
- # .ENDIF
- 
- .INCLUDE: target.mk
-diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
-index 2faca1d..2af50a9 100644
---- transex3/source/makefile.mk
-+++ transex3/source/makefile.mk
-@@ -89,7 +89,6 @@ APP1OBJS=   $(OBJ)$/src_yy_wrapper.obj
- 
- APP1STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- .IF "$(OS)"=="MACOSX"
-@@ -105,7 +104,7 @@ APP2OBJS= $(OBJ)$/helpmerge.obj  $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)
- .IF "$(OS)"!="MACOSX"
- .ENDIF
- 
--APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
-+APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB)
- 
- .IF "$(OS)"=="MACOSX"
- # static libs at end for OS X
-@@ -120,7 +119,6 @@ APP3OBJS=   $(OBJ)$/lngmerge.obj $(OBJ)$/hw2fw.obj $(OBJ)$/merge.obj $(OBJ)$/exp
- .ENDIF
- APP3STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- .IF "$(OS)"=="MACOSX"
- # static libs at end for OS X
-@@ -131,7 +129,6 @@ APP4TARGET= gsiconv
- APP4OBJS=   $(OBJ)$/utf8conv.obj $(OBJ)$/gsiconv.obj
- APP4STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- # tag checker for *.gsi
-@@ -139,7 +136,6 @@ APP5TARGET= gsicheck
- APP5OBJS=   $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj
- APP5STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- # extractor and merger for *.cfg
-@@ -152,7 +148,6 @@ APP6OBJS=   $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/hw2fw.obj $(
- 
- APP6STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- .IF "$(OS)"=="MACOSX"
-@@ -168,7 +163,6 @@ APP7OBJS=   $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/hw2fw.obj $(
- 
- APP7STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- .IF "$(OS)"=="MACOSX"
-@@ -189,7 +183,6 @@ APP9OBJS=   $(OBJ)$/localize.obj $(OBJ)$/utf8conv.obj $(OBJ)$/srciter.obj $(OBJ)
- 
- APP9STDLIBS+= \
-             $(TOOLSLIB) \
--            $(VOSLIB) \
-             $(SALLIB)
- 
- DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS)
-diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
-index 2217997..a73c35a 100644
---- ucb/workben/ucb/makefile.mk
-+++ ucb/workben/ucb/makefile.mk
-@@ -77,7 +77,6 @@ COMPHELPERLIB=icomphelp2.lib
- 
- APP1STDLIBS=\
- 	$(SALLIB) \
--	$(VOSLIB) \
- 	$(CPPULIB) \
- 	$(CPPUHELPERLIB) \
- 	$(COMPHELPERLIB) \
-diff --git a/unotools/util/makefile.mk b/unotools/util/makefile.mk
-index 6a2f5a1..cedf2b6 100644
---- unotools/util/makefile.mk
-+++ unotools/util/makefile.mk
-@@ -71,7 +71,6 @@ SHL1STDLIBS= \
- 		$(CPPULIB) \
- 		$(I18NISOLANGLIB) \
- 		$(TOOLSLIB) \
--		$(VOSLIB) \
- 		$(SALLIB)
- 
- SHL1LIBS=$(LIB1TARGET)
-diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk
-index 54443e9..1dc99a5 100644
---- vcl/test/makefile.mk
-+++ vcl/test/makefile.mk
-@@ -63,7 +63,6 @@ APP1STDLIBS=	$(CPPULIB)			\
- 				$(CPPUHELPERLIB)	\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(COMPHELPERLIB)	\
- 				$(VCLLIB)
-diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk
-index a15d5b9..c7de968 100644
---- vcl/util/linksvp/makefile.mk
-+++ vcl/util/linksvp/makefile.mk
-@@ -67,7 +67,6 @@ SHL1STDLIBS=\
-             $(UCBHELPERLIB)     \
-             $(CPPUHELPERLIB)    \
-             $(CPPULIB)          \
--            $(VOSLIB)           \
-             $(SALLIB)
- .ENDIF # GUIBASE unx
- 
-diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
-index b9d3e93..4524b19 100644
---- vcl/util/makefile.mk
-+++ vcl/util/makefile.mk
-@@ -176,7 +176,6 @@ SHL1STDLIBS+=\
-             $(UCBHELPERLIB)     \
-             $(CPPUHELPERLIB)    \
-             $(CPPULIB)          \
--            $(VOSLIB)           \
-             $(SALLIB)			\
-             $(BASEGFXLIB)		\
-             $(ICUUCLIB)			\
-@@ -275,7 +274,6 @@ SHL2STDLIBS=\
-             $(UCBHELPERLIB)     \
-             $(CPPUHELPERLIB)    \
-             $(CPPULIB)          \
--            $(VOSLIB)           \
-             $(SALLIB)
- 
- # prepare linking of Xinerama
-@@ -372,7 +370,6 @@ SHL4STDLIBS+=\
-             $(UCBHELPERLIB)     \
-             $(CPPUHELPERLIB)    \
-             $(CPPULIB)          \
--            $(VOSLIB)           \
-             $(SALLIB)
- 
- .ENDIF # "$(ENABLE_GTK)" != ""
-@@ -392,7 +389,6 @@ SHL5STDLIBS+=\
-         $(VCLLIB)       \
-         -lpsp$(VERSION)$(DLLPOSTFIX)\
-         $(TOOLSLIB)     \
--        $(VOSLIB)       \
-         $(SALLIB)
- .ENDIF # "$(ENABLE_KDE)" != ""
- 
-diff --git a/vcl/workben/makefile.mk b/vcl/workben/makefile.mk
-index e1f2734..87ed0a0 100644
---- vcl/workben/makefile.mk
-+++ vcl/workben/makefile.mk
-@@ -68,7 +68,6 @@ APP1STDLIBS=	$(CPPULIB)			\
- 				$(COMPHELPERLIB)	\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(VCLLIB)
- 
-@@ -106,7 +105,6 @@ APP3STDLIBS=	$(CPPULIB)			\
- 				$(COMPHELPERLIB)	\
- 				$(TOOLSLIB) 		\
- 				$(SALLIB)			\
--				$(VOSLIB)			\
- 				$(SOTLIB)			\
- 				$(VCLLIB)
- 
-@@ -124,7 +122,6 @@ APP4STDLIBS=    $(CPPULIB)                      \
-                                 $(VCLLIB)                       \
-                                 $(TOOLSLIB)             \
-                                 $(SALLIB)                       \
--                                $(VOSLIB)                       \
-                                 $(SOTLIB)                       \
-                                 $(VCLLIB)
- 
-@@ -138,7 +135,6 @@ APP5STDLIBS=    $(CPPULIB)                      \
-                                 $(VCLLIB)                       \
-                                 $(TOOLSLIB)             \
-                                 $(SALLIB)                       \
--                                $(VOSLIB)                       \
-                                 $(SOTLIB)                       \
-                                 $(VCLLIB)
- 
-diff --git a/vos/docu/.html b/vos/docu/.html
-deleted file mode 100644
-index bce575d..0000000
---- vos/docu/.html
-+++ /dev/null
-@@ -1,138 +0,0 @@
--<html><head><TITLE></TITLE></head>
--<body>
--<H2><A HREF ="#DOC.DOCU" > <IMG BORDER=0 SRC=down.gif></A>    </H2>
--<TABLE>
--<TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IAcceptHandler.html><B>IAcceptHandler</B></A> <br>
--<I>Interface IAcceptHandler
--Overload onConnection() to handle a connected socket</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IAcceptHandlerFactory.html><B>IAcceptHandlerFactory</B></A> <br>
--<I>Interface IAcceptHandlerFactory
--Creates objects with IAcceptHandler interface</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OAcceptor.html><B>OAcceptor</B></A> <br>
--<I>Starts a thread where incoming connections are accepted</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OByteArray.html><B>OByteArray</B></A> <br>
--<I>Array of bytes</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OByteStream.html><B>OByteStream</B></A> <br>
--<I>Wraps a byte-stream around a byte array</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=ICondition.html><B>ICondition</B></A> <br>
--<I>ICondition
--
--Interface for a thread-spanning condition</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OCondition.html><B>OCondition</B></A> <br>
--<I>OCondition
--
--Implements the ICondition interface</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IConnectHandler.html><B>IConnectHandler</B></A> <br>
--<I>Interface IConnectHandler</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OConnector.html><B>OConnector</B></A> <br>
--<I>Delegates a connected socket to an IConnectHandler object</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OException.html><B>OException</B></A> <br>
--<I>Base class for exceptions</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OSimpleException.html><B>OSimpleException</B></A> <br>
--<I></I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IExecutable.html><B>IExecutable</B></A> <br>
--<I>IExecutable
--
--The IExecutable-interface is to be understood as wrapper around
--your application-code, which allows it to be executed asynchronously</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OExecutable.html><B>OExecutable</B></A> <br>
--<I>OExecutable
--added default impl</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OFiberingServer.html><B>OFiberingServer</B></A> <br>
--<I>OFiberingServer
--
--Depends on cooperative executing IExecutable-Objects</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OFuture.html><B>OFuture</B></A> <br>
--<I>OFuture, OFutureRef
--
--A future represents the result of an asynchronous operation</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OFutureRef.html><B>OFutureRef</B></A> <br>
--<I>OFutureRef
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IStream.html><B>IStream</B></A> <br>
--<I>Interface for a stream of data, on that you can read and write blocks of bytes</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IMutex.html><B>IMutex</B></A> <br>
--<I>IMutex interface
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OThreadMutex.html><B>OThreadMutex</B></A> <br>
--<I>OThreadMutex
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OGuard.html><B>OGuard</B></A> <br>
--<I>OGuard
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OObject.html><B>OObject</B></A> <br>
--<I>OObject
--common base class for all framework classes</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OCreateParam.html><B>OCreateParam</B></A> <br>
--<I>
--Basic class information</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OClassInfo.html><B>OClassInfo</B></A> <br>
--<I></I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IObserver.html><B>IObserver</B></A> <br>
--<I>IObserver
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IObserved.html><B>IObserved</B></A> <br>
--<I>IObserved
--
--Just an idea</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OObserver.html><B>OObserver</B></A> <br>
--<I>OObserver
--
--add default-implementation of refence-counting behaviour to IObserver-Interface
--
--</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=ORef.html><B>ORef</B></A> <br>
--<I>
--ORef<T>
--
--template type to implement handle/body behaviour 
--with reference-counting</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IReferenceCounter.html><B>IReferenceCounter</B></A> <br>
--<I>Interface for refernce-counting</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IRunnable.html><B>IRunnable</B></A> <br>
--<I>IRunnable
--
--The IRunnable-interface is to be understood as wrapper around
--your application-code, which allows it to be executed asynchronously</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OExecutableThread.html><B>OExecutableThread</B></A> <br>
--<I>OExecutableThread
--
--A thread used to execute an IExecutable-Object</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OSemaphore.html><B>OSemaphore</B></A> <br>
--<I>Counting semaphore (unnamed, because thread-local)</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=ISocketTypes.html><B>ISocketTypes</B></A> <br>
--<I>Base data types</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=ISocketAddr.html><B>ISocketAddr</B></A> <br>
--<I>Base class for socket addresses</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OInetSocketAddr.html><B>OInetSocketAddr</B></A> <br>
--<I>Represents an internet-address</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OIpxSocketAddr.html><B>OIpxSocketAddr</B></A> <br>
--<I>Represents an IPX/SPX address</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OSocket.html><B>OSocket</B></A> <br>
--<I>Represents a socket</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OStreamSocket.html><B>OStreamSocket</B></A> <br>
--<I>A socket to send or receive a stream of data</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OAcceptorSocket.html><B>OAcceptorSocket</B></A> <br>
--<I>A socket to accept incoming connections</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OConnectorSocket.html><B>OConnectorSocket</B></A> <br>
--<I>A socket to initiate a conenction</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=ODatagramSocket.html><B>ODatagramSocket</B></A> <br>
--<I>A connectionless socket to send and receive datagrams</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=IPositionableStream.html><B>IPositionableStream</B></A> <br>
--<I>Adds seeking capabilities to IStream</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OStream.html><B>OStream</B></A> <br>
--<I>Implements IPositionableStream</I>
--</TD></TR><TR><TD VALIGN=top><IMG BORDER=0 SRC=icon1.gif> </TD><TD><A HREF=OString.html><B>OString</B></A> <br>
--<I>A string class</I>
--</TD></TR>
--</TABLE>
--<A NAME="DOC.DOCU">
--<DL></DL><P><I><A HREF="aindex.html"> alphabetic index</A></I>  <I><A HREF="HIER.html"> hierarchy of classes</A></I><P></BODY><hr>
--<A HREF="http://www.zib.de/Visual/software/doc++/index.html"><IMG BORDER=0 ALIGN=RIGHT SRC=logo.gif></A>
--<P Align=Center><I>this page has been generated automatically by doc++
--<P Align=Center>(c)opyright by <A HREF="http://www.zib.de/zoeckler/"> Malte  Z&oumlckler</A>, <A HREF="mailto:wunderling at zib.de"> Roland Wunderling </A><br>contact: <A HREF="mailto:doc++ at zib.de"> doc++ at zib.de </a>
-\ No newline at end of file
-diff --git a/vos/inc/vos/connectn.hxx b/vos/inc/vos/connectn.hxx
-deleted file mode 100644
-index e7c2841..0000000
---- vos/inc/vos/connectn.hxx
-+++ /dev/null
-@@ -1,129 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: connectn.hxx,v $
-- *
-- *  $Revision: 1.4 $
-- *
-- *  last change: $Author: vg $ $Date: 2006/06/02 12:36:09 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--
--#ifndef _VOS_CONNECTN_HXX_
--#define _VOS_CONNECTN_HXX_
--
--#ifndef _VOS_REF_HXX_
--#   include <vos/ref.hxx>
--#endif
--
--#ifndef _RTL_USTRING_HXX_
--#   include <rtl/ustring.hxx>
--#endif
--
--namespace vos
--{
--//---------------------------------------------------------------------------
--/** abstract connection class
-- */
--
--class IConnection: public ::vos::IReference
--{
--public:
--
--    //---------------------------------------------------------------------------
--    /** reads the specified amount of bytes from the stream. The call will block
--        until nBytesToRead bytes are available.
--
--        @param pData
--        pointer to the buffer to fill.
--
--        @param nBytesToRead
--        the number of bytes to read.
--
--        @returns
--        the number of bytes read;
--    */
--
--    virtual sal_Int32 SAL_CALL read( sal_Int8* pData, sal_Int32 nBytesToRead ) = 0;
--
--    //---------------------------------------------------------------------------
--    /** tries to read the specified amount of bytes from the stream.
--
--        @param pData
--        pointer to the buffer to fill.
--
--        @param nBytesToRead
--        the maximum number of bytes to read.
--
--        @returns
--        the number of bytes read;
--    */
--
--    virtual sal_Int32 SAL_CALL readSomeBytes( sal_Int8* pData, sal_Int32 nBytesToRead ) = 0;
--
--    //---------------------------------------------------------------------------
--    /** writes the specified number of bytes to the stream.
--
--        @param pData
--        pointer to the buffer to read from.
--
--        @param nBytesToWrite
--        the number of bytes to write.
--    */
--
--    virtual sal_Int32 SAL_CALL write( const sal_Int8* pData , sal_Int32 nBytesToWrite ) = 0;
--
--    //---------------------------------------------------------------------------
--    /** flushes all output data to the stream.
--    */
--
--    virtual sal_Int32 SAL_CALL flush() = 0;
--
--    //---------------------------------------------------------------------------
--    /** closes the stream of the connection.
--
--        NOTE: implementation must be able to handle more than one close calls.
--    */
--
--    virtual sal_Int32 SAL_CALL close() = 0;
--
--    //---------------------------------------------------------------------------
--    /** gets the source address
--    */
--    virtual ::rtl::OUString SAL_CALL getSource() = 0;
--
--    //---------------------------------------------------------------------------
--    /** gets the destination address
--    */
--    virtual ::rtl::OUString SAL_CALL getDestination() = 0;
--};
--
--}
--
--#endif // _VOS_CONNECTN_HXX_
--
-diff --git a/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx
-deleted file mode 100644
-index bfb7604..0000000
---- vos/inc/vos/execabl.hxx
-+++ /dev/null
-@@ -1,161 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: execabl.hxx,v $
-- *
-- *  $Revision: 1.3 $
-- *
-- *  last change: $Author: vg $ $Date: 2006/06/02 12:36:25 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--
--#ifndef _VOS_EXECABL_HXX_
--#define _VOS_EXECABL_HXX_
--
--#ifndef _VOS_REFERNCE_HXX_
--#	include <vos/refernce.hxx>
--#endif
--
--namespace vos
--{     
--
--
--/** IExecutable
--
--	The IExecutable-interface is to be understood as wrapper around
--	your application-code, which allows it to be executed asynchronously.
--
--	Wether you want real asynchronous behaviour or just pseudo-multitasking
--	depends on which kind of execution-service you use to execute your executable.
--
--	(E.g. Threadpool/Fiberpool)
--
--	@author  Bernd Hofner
--	@version 0.1
--*/
--
--class IExecutable : public vos::IReference 
--{
--public:
--
--	/** Overload to implement your functionality.
--		Return True, if you want "execute()" to be called again.
--	*/
--	virtual sal_Bool SAL_CALL execute()= 0;
--
--
--	/** If you use blocking calls within your execute-function,
--		you should provide here a means to unblock cleanly.
--		@Return False if you are not able to unblock the
--		thread.
--		
--	*/
--	virtual sal_Bool SAL_CALL unblock()= 0;
--
--	/**
--		STL demands this operators if you want to place
--		IExecutables per value in collections.
--	*/
--	virtual sal_Bool SAL_CALL operator<(const IExecutable&) const= 0;
--	virtual sal_Bool SAL_CALL operator>(const IExecutable&) const= 0;
--	virtual sal_Bool SAL_CALL operator==(const IExecutable&) const= 0;
--	virtual sal_Bool SAL_CALL operator!=(const IExecutable&) const= 0;
--};
--
--
--/** OExecutable
--	added default impl. of IReferenceCounter 
--*/
--class OExecutable : public vos::IExecutable,
--					public vos::OReference
--					
--{
--public:
--
--	virtual ~OExecutable()
--	{
--	}
--
--	/*
--		Since the dominance of the OReferenceCounter impl.
--		of the IReferenceCounter is not granted, delegate
--		the methods to this branch of the diamond-shaped
--		inheritance tree.
--	*/
--
--	virtual RefCount SAL_CALL acquire()
--	{
--		return OReference::acquire();
--	}
--	virtual RefCount SAL_CALL release()
--	{
--		return OReference::release();
--	}
--	virtual RefCount SAL_CALL referenced() const
--	{
--		return OReference::referenced();
--	}
--
--
--	/** Default implementation of unblock does nothing.
--	*/
--	virtual sal_Bool SAL_CALL unblock() { return sal_True; }
--
--
--	/**
--		STL demands this operators if you want to place
--		IExecutables per value in collections.
--		Use a default implementation of the comparison-operators
--		here without a correct semantic.
--	*/
--	virtual sal_Bool SAL_CALL operator<(const IExecutable&) const
--	{
--		return sal_False;
--	}
--
--	virtual sal_Bool SAL_CALL operator>(const IExecutable&) const
--	{
--		return sal_False;
--	}
--
--	virtual sal_Bool SAL_CALL operator==(const IExecutable&) const
--	{
--		return sal_True;
--	}
--
--	virtual sal_Bool SAL_CALL operator!=(const IExecutable&) const
--	{
--		return sal_False;
--	}
--};
--
--}
--
--
--#endif  // _VOS_EXECABL_HXX_
--
-diff --git a/vos/inc/vos/istream.hxx b/vos/inc/vos/istream.hxx
-deleted file mode 100644
-index 1fd78ec..0000000
---- vos/inc/vos/istream.hxx
-+++ /dev/null
-@@ -1,82 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: istream.hxx,v $
-- *
-- *  $Revision: 1.4 $
-- *
-- *  last change: $Author: hr $ $Date: 2006/06/20 04:05:18 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--#ifndef _VOS_ISTREAM_HXX_
--#define _VOS_ISTREAM_HXX_
--
--#ifndef _SAL_TYPES_H_
--#include "sal/types.h"
--#endif
--
--namespace vos
--{     
--
--/** Interface for a stream of data, on that you can read and write blocks of bytes.
--*/
--class IStream
--{
--public:
--
--    IStream() { }
--    virtual ~IStream() { }
--    
--    
--	/** Retrieve n bytes from the stream and copy them into pBuffer.
--		@param pBuffer receives the read data.
--		@param n the number of bytes to read. pBuffer must be large enough
--		to hold the n bytes!
--		@return the number of read bytes
--	*/
--    virtual sal_Int32 SAL_CALL read(void* pBuffer, 
--					     sal_uInt32 n) const= 0;
--
--	/** Write n bytes from pBuffer to the stream.
--		@param pBuffer contains the data to be written.
--		@param n the number of bytes to write.
--		@return the number of written bytes
--	*/
--    virtual sal_Int32 SAL_CALL write(const void* pBuffer, 
--					      sal_uInt32 n)= 0;
--    
--	/** Checks if stream is closed for further reading.
--		@return True is stream has ended (e.g. was closed).
--	*/
--	virtual sal_Bool SAL_CALL isEof() const = 0;
--};
--
--}     
--
--#endif	// _VOS_ISTREAM_HXX_
--
-diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
-deleted file mode 100644
-index a14b612..0000000
---- vos/inc/vos/macros.hxx
-+++ /dev/null
-@@ -1,169 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: macros.hxx,v $
-- *
-- *  $Revision: 1.4 $
-- *
-- *  last change: $Author: vg $ $Date: 2006/06/02 12:36:54 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--
--#ifndef _VOS_MACROS_HXX_
--#define _VOS_MACROS_HXX_
--
--
--#ifndef _OSL_ENDIAN_H_
--#include <osl/endian.h>
--#endif
--
--// *********************************************************************
--// Macro definitions
--
--#ifndef VOS_CAST
--#	define VOS_CAST(type,value)    (*((type*)&(value)))
--#endif 
--
--#ifndef VOS_UNUSED
--#	define VOS_UNUSED(x)           (x=x)
--#endif
--
--#ifndef VOS_FOREVER
--#	define VOS_FOREVER             for(;;)
--#endif
--
--#ifndef VOS_MAX
--#	define VOS_MAX(a,b)            (((a) > (b)) ? (a) : (b))
--#endif
--#ifndef VOS_MIN
--#	define VOS_MIN(a,b)            (((a) < (b)) ? (a) : (b))
--#endif
--
--#ifndef VOS_ABS
--#	define VOS_ABS(a)              (((a) < 0) ? (-(a)) : (a))
--#endif
--#ifndef VOS_SIGN
--#	define VOS_SIGN(a)             ( ((a) < 0) ? (-1) : (((a) > 0) ? (1) : (0)) )
--#endif
--
--#ifndef VOS_BOUND
--#	define VOS_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
--#endif
--
--#ifndef VOS_SWAP
--#	define VOS_SWAP(a,b)           ((a) ^= (b) ^= (a) ^= (b))
--#endif
--
--#ifndef VOS_BYTEBOUND
--#	define VOS_BYTEBOUND(a)        (((a) + 7) / 8)
--#endif
--
--#ifndef VOS_WORDBOUND
--#	define VOS_WORDBOUND(a)        ((((a) + 15) / 16) * 2)
--#endif
--
--#ifndef VOS_DWORDBOUND
--#	define VOS_DWORDBOUND(a)       ((((a) + 31) / 32) * 4)
--#endif
--
--#ifndef VOS_MAKEDWORD
--#	define VOS_MAKEDWORD(wl, wh)   ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
--#endif
--#ifndef VOS_LOWORD
--#	define VOS_LOWORD(d)           ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
--#endif
--#ifndef VOS_HIWORD
--#	define VOS_HIWORD(d)           ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
--#endif
--#ifndef VOS_MAKEWORD
--#	define VOS_MAKEWORD(bl, bh)    ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
--#endif
--#ifndef VOS_LOBYTE
--#	define VOS_LOBYTE(w)           ((sal_uInt8)((sal_uInt16)(w) & 0xFF))
--#endif
--#ifndef VOS_HIBYTE
--#	define VOS_HIBYTE(w)           ((sal_uInt8)(((sal_uInt16)(w) >> 8) & 0xFF))
--#endif
--#ifndef VOS_MAKEBYTE
--#	define VOS_MAKEBYTE(nl, nh)    ((sal_uInt8)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
--#endif
--#ifndef VOS_LONIBBLE
--#	define VOS_LONIBBLE(b)         ((sal_uInt8)((b) & 0x0F))
--#endif
--#ifndef VOS_HINIBBLE
--#	define VOS_HINIBBLE(b)         ((sal_uInt8)(((b) >> 4) & 0x0F))
--#endif
--
--#ifndef VOS_SWAPWORD
--#	define VOS_SWAPWORD(w)         VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
--#endif
--#ifndef VOS_SWAPDWORD
--#	define VOS_SWAPDWORD(d)        VOS_MAKEDWORD(VOS_SWAPWORD(VOS_HIWORD(d)),VOS_SWAPWORD(VOS_LOWORD(d)))
--#endif
--
--#ifdef OSL_BIGENDIAN
--#ifndef VOS_NETWORD
--#	define VOS_NETWORD(w)          (sal_uInt16)(w)
--#endif
--#ifndef VOS_NETDWORD
--#	define VOS_NETDWORD(d)         (sal_uInt32)(d)
--#endif
--#else  // OSL_LITENDIAN
--#ifndef VOS_NETWORD
--#	define VOS_NETWORD(w)          VOS_MAKEWORD(VOS_HIBYTE(w),VOS_LOBYTE(w))
--#endif
--#ifndef VOS_NETDWORD
--#	define VOS_NETDWORD(d)         VOS_MAKEDWORD(VOS_NETWORD(VOS_HIWORD(d)),VOS_NETWORD(VOS_LOWORD(d)))
--#endif
--#endif // OSL_BIGENDIAN
--
--#ifdef _OSL_MEMSEG
--#	define VOS_MAKEPTR(base, off)  ((void _far *)VOS_MAKEDWORD((off), (base)))
--#	define VOS_BASEOF(ptr)         VOS_HIWORD(ptr)
--#	define VOS_OFSTOF(ptr)         VOS_LOWORD(ptr)
--#else
--#	define VOS_MAKEPTR(base, off)  ((void *)((base) + (off)))
--#	define VOS_BASEOF(ptr)         (ptr)
--#	define VOS_OFSTOF(ptr)         0
--#endif
--
--#ifndef VOS_FIELDOFFSET
--#	define VOS_FIELDOFFSET(type, field) ((sal_Int32)(&((type *)1)->field) - 1)
--#endif
--
--// def. for arbitrary namespace
--#define VOS_NAMESPACE(class_name, name_space) name_space::class_name
--
--// sal_Int16 def. for namespace vos
--#define NAMESPACE_VOS(class_name) vos::class_name
--
--// sal_Int16 def. for namespace std
--#define NAMESPACE_STD(class_name) std::class_name
--
--#endif //_VOS_MACROS_HXX_
--
-diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
-deleted file mode 100644
-index 340900a..0000000
---- vos/inc/vos/object.hxx
-+++ /dev/null
-@@ -1,202 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: object.hxx,v $
-- *
-- *  $Revision: 1.5 $
-- *
-- *  last change: $Author: vg $ $Date: 2006/06/02 12:37:38 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--
--#ifndef _VOS_OBJECT_HXX_
--#define _VOS_OBJECT_HXX_
--
--#ifndef _VOS_MACROS_HXX_
--#	include <vos/macros.hxx>
--#endif
--
--namespace vos
--{     
--
--// ***************************************
--// Object super class
--
--struct OClassInfo;
--struct OCreateParam;
--
--/** OObject
--	common base class for all framework classes. Used for memory-management
--	and runtime type-info.
--*/
--class OObject
--{
--public:
--
--	///
--	OObject();
--
--	///
--	OObject(const OCreateParam& rParam);
--
--	// Disable the copy constructor and assignment by default so you will get
--	// compiler errors instead of unexpected behaviour if you pass objects
--	// by value or assign objects.
--private:
--	OObject(const OObject& objectSrc);			// no implementation
--	void SAL_CALL operator=(const OObject& objectSrc);	// no implementation
--
--public:
--	virtual ~OObject();
--
--public:
--
--	/** Define private new and delete operator because of compiler bug, 
--		when allocating and deleteing a exported class
--	*/
--	void* SAL_CALL operator new(size_t size);
--	void* SAL_CALL operator new(size_t size, void* p);
--
--	void  SAL_CALL operator delete(void* p);
--
--// Attributes
--public:
--
--	///
--	virtual const OClassInfo& SAL_CALL getClassInfo() const;
--
--	///
--	sal_Bool SAL_CALL isKindOf(const OClassInfo& rClass) const;
--
--// Implementation
--public:
--	static const OClassInfo& SAL_CALL classInfo();
--
--public:
--	static OClassInfo __ClassInfo__;
--};
--
--
--/**
--	Basic class information
--*/
--struct OCreateParam
--{
--	sal_uInt32 m_Size;
--	void*	 m_pParam;
--
--	///
--	OCreateParam(void *pParam)
--	{	
--		m_Size = sizeof(OCreateParam);
--		m_pParam = pParam;
--	}
--};
--
--/**
--*/
--struct OClassInfo
--{
--	///
--	const sal_Char  *m_pClassName;
--	///
--	sal_Int32			 m_nObjectSize;
--	/// schema number of the loaded class
--	sal_uInt32	 m_wSchema;				
--
--	///
--	OObject* (SAL_CALL * m_pfnCreateObject)(const OCreateParam&);	// NULL => abstract class
--
--	/// linked list of registered classes
--	const OClassInfo* m_pBaseClass;
--	/// linked list of registered classes
--	const OClassInfo* m_pNextClass;			
--
--	///
--	OObject* SAL_CALL createObject(const OCreateParam& rParam) const;
--
--	///
--	sal_Bool SAL_CALL isDerivedFrom(const OClassInfo& rBaseClass) const;
--
--	///
--	static const OClassInfo* SAL_CALL getClassInfo(const sal_Char* pClassName);
--
--	///
--	OClassInfo(const sal_Char *pClassName, sal_Int32 ObjectSize,
--		       const OClassInfo* pBaseClass = NULL, sal_uInt32 Schema = (sal_uInt32)-1,
--			   OObject* (SAL_CALL * fnCreateObject)(const OCreateParam&) = NULL); 
--};
--
--// *****************************************************************
--// Helper macros for declaring OClassInfo data
--
--
--#define VOS_STRINGIZE(name) #name
--
--#define VOS_CLASSNAME(class_name, domain_name) VOS_STRINGIZE(domain_name.class_name)
--
--#define VOS_CLASSINFO(class_name) (class_name::classInfo())
--
--// generate static object constructor for class registration
--struct VOS_CLASSINIT
--{ VOS_CLASSINIT(VOS_NAMESPACE(OClassInfo, vos)* pNewClass); };
--
--#define VOS_CLASSDATA(class_spec, class_name, base_class_name, wSchema, constructor) \
--	VOS_NAMESPACE(OClassInfo, vos) class_name::__ClassInfo__(class_spec, \
--	    sizeof(class_name), &VOS_CLASSINFO(base_class_name), wSchema, constructor); \
--    const VOS_NAMESPACE(VOS_CLASSINIT, vos) class_name::__ClassInit__(&class_name::__ClassInfo__); \
--    const VOS_NAMESPACE(OClassInfo, vos)& SAL_CALL class_name::getClassInfo() const \
--		{ return (VOS_CLASSINFO(class_name)); } \
--    const VOS_NAMESPACE(OClassInfo, vos)& SAL_CALL class_name::classInfo() \
--		{ return (__ClassInfo__); }
--	
--#define VOS_DECLARE_CLASSINFO(class_name) \
--public: \
--	static const VOS_NAMESPACE(VOS_CLASSINIT, vos) __ClassInit__; \
--    static VOS_NAMESPACE(OClassInfo, vos) __ClassInfo__; \
--public: \
--	virtual const VOS_NAMESPACE(OClassInfo, vos)& SAL_CALL getClassInfo() const; \
--    static const VOS_NAMESPACE(OClassInfo, vos)& SAL_CALL classInfo()
--
--#define VOS_IMPLEMENT_CLASSINFO(class_spec, class_name, base_class_name, wSchema) \
--	VOS_CLASSDATA(class_spec, class_name, base_class_name, wSchema, NULL)
--
--#define VOS_DECLARE_CLASSTYPE(class_name) \
--	VOS_DECLARE_CLASSINFO(class_name); \
--public: \
--	static VOS_NAMESPACE(OObject, vos)* SAL_CALL createObject(const VOS_NAMESPACE(OCreateParam, vos)& rParam);
--
--#define VOS_IMPLEMENT_CLASSTYPE(class_spec, class_name, base_class_name, wSchema) \
--	VOS_CLASSDATA(class_spec, class_name, base_class_name, wSchema, class_name::createObject) \
--	VOS_NAMESPACE(OObject, vos)* class_name::createObject(const VOS_NAMESPACE(OCreateParam, vos)& rParam) \
--		{ return new class_name(rParam); }
--
--}
--
--#endif // _VOS_OBJECT_HXX_
--
-diff --git a/vos/inc/vos/ref.hxx b/vos/inc/vos/ref.hxx
-deleted file mode 100644
-index 3a0a203..0000000
---- vos/inc/vos/ref.hxx
-+++ /dev/null
-@@ -1,193 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: ref.hxx,v $
-- *
-- *  $Revision: 1.3 $
-- *
-- *  last change: $Author: vg $ $Date: 2006/06/02 12:38:21 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software
-- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- *    MA  02111-1307  USA
-- *
-- ************************************************************************/
--
--
--#ifndef _VOS_REF_HXX_
--#define _VOS_REF_HXX_
--
--/**
--	ORef<T>
--
--	template type to implement handle/body behaviour 
--	with reference-counting.
--
--	Note that the template-type T MUST implement IReferenceCounter.
--
--*/
--
--#ifndef _VOS_REFERNCE_HXX_
--#	include <vos/refernce.hxx>
--#endif
--#ifndef _OSL_DIAGNOSE_H_
--#	include <osl/diagnose.h>
--#endif
--
--namespace vos
--{     
--
--
--template <class T>
--class ORef 
--{
--public:
--
--	/** Creates an "empty" reference, use "create()" or
--		assignment/copy-operator to make it a valid reference.
--	*/
--	ORef();
--
--	/** Creates a reference which points to pBody.
--		pBodys reference is not changed!. (like create(...)).
--	*/
--	ORef(T* pBody);
--
--	/** Overload copy-constr. to implement ref-counting.
--		As a result of the following code:
--
--			ORef<x> h1, h2;
--
--			h1.create();
--			h2= h1;
--
--		h1 and h2 will represent the same body.
--
--	*/
--	ORef(const ORef<T>& handle);
--
--	/** Decreases ref-count of underlying body.
--	*/
--	inline ~ORef();
--
--	/** Overload assignment-operator to implement ref-counting.
--		Unbinds this instance from its body (if bound) and
--		bind it to the body represented by the handle.
--	*/
--	ORef<T>& SAL_CALL operator= (const ORef<T>& handle);
--
--
--
--	/** Binds the body to this handle.
--		The "pBody"s reference-count is increased.
--
--		If you call bind() on an existing body,
--		the old body is unbound before the new one is
--		assigned.
--
--	*/
--	void SAL_CALL bind(T* pBody);
--
--	/** Unbind the body from this handle.
--		Note that for a handle representing a large body,
--		"handle.unbind().bind(new body());" _might_
--		perform a little bit better than "handle.bind(new body());",
--		since in the second case two large objects exist in memory
--		(the old body and the new body).
--	*/
--	ORef<T>& SAL_CALL unbind();
--
--	/** Same as bind().
--	*/
--	void SAL_CALL operator= (T* pBody);
--
--	/** Just in case you want to call handle().someBodyOp()...
--	*/
--	T& SAL_CALL operator() () const;
--
--	/** Allows (*handle).someBodyOp().
--	*/
--	T& SAL_CALL operator* () const;
--
--	/** Probably most common used: handle->someBodyOp().
--	*/
--	T* SAL_CALL operator->() const;
--
--	/** Gives access to the handles body. 
--	*/
--	T& SAL_CALL getBody() const;
--
--	/** Can be used instead of operator->.
--		I.e. handle->someBodyOp() and handle.getBodyPtr()->someBodyOp()
--		are the same.
--	*/
--	T* SAL_CALL getBodyPtr() const;
--
--	/** Returns True is the body is empty (the handle
--		does not point to a valid body).
--	*/
--	sal_Bool SAL_CALL isEmpty() const;
--	
--	/** Returns True is the body is "full" (the handle
--		does point to a valid body).
--	*/
--	sal_Bool SAL_CALL isValid() const;
--
--	/** Returns True is handle points to the same body.
--	*/
--	sal_Bool SAL_CALL isEqualBody(const ORef<T>& handle) const;
--
--	/** Delegates comparison to the body.
--	*/
--	sal_Bool SAL_CALL operator== (const ORef<T>& handle) const;
--
--	/** Delegates comparison to the body.
--	*/
--	sal_Bool SAL_CALL operator!= (const ORef<T>& handle) const;
--
--	/** Returns True is "this" points to pBody.
--	*/
--	sal_Bool SAL_CALL operator== (const T* pBody) const;
--
--	/** Needed to place ORefs into STL collection.
--		Delegates comparison to the body.
--	*/
--	sal_Bool SAL_CALL operator< (const ORef<T>& handle) const;
--
--	/** Needed to place ORefs into STL collection.
--		Delegates comparison to the body.
--	*/
--	sal_Bool SAL_CALL operator> (const ORef<T>& handle) const;
--
--protected:
--
--	T* m_refBody;
--};
--
--// include template implementation
--#include <vos/ref.inl>
--
--}     
--
--
--#endif // _VOS_REF_HXX_
-diff --git a/vos/inc/vos/ref.inl b/vos/inc/vos/ref.inl
-deleted file mode 100644
-index 5116be5..0000000
---- vos/inc/vos/ref.inl
-+++ /dev/null
-@@ -1,200 +0,0 @@
--/*************************************************************************
-- *
-- *  OpenOffice.org - a multi-platform office productivity suite
-- *
-- *  $RCSfile: ref.inl,v $
-- *
-- *  $Revision: 1.2 $
-- *
-- *  last change: $Author: rt $ $Date: 2005/09/09 09:02:12 $
-- *
-- *  The Contents of this file are made available subject to
-- *  the terms of GNU Lesser General Public License Version 2.1.
-- *
-- *
-- *    GNU Lesser General Public License Version 2.1
-- *    =============================================
-- *    Copyright 2005 by Sun Microsystems, Inc.
-- *    901 San Antonio Road, Palo Alto, CA 94303, USA
-- *
-- *    This library is free software; you can redistribute it and/or
-- *    modify it under the terms of the GNU Lesser General Public
-- *    License version 2.1, as published by the Free Software Foundation.
-- *
-- *    This library is distributed in the hope that it will be useful,
-- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- *    Lesser General Public License for more details.
-- *
-- *    You should have received a copy of the GNU Lesser General Public
-- *    License along with this library; if not, write to the Free Software

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list