diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-21 17:34:55 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | ab9eecc53a6f87ccb6004e21c44d73b5f6e1ec1f (patch) | |
| tree | 42ec37a9189f66555e40ab854fd0f18a4776aee1 | |
| parent | 08be4cfe51342b5b08511951b9c5ff13b3eeee8d (diff) | |
Finally, gut the vos module out of the build
53 files changed, 26 insertions, 4008 deletions
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst index 9d44807c9cc3..a38f99985379 100644 --- a/comphelper/prj/build.lst +++ b/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 ae391e92abf7..33dcfbf98625 100644 --- a/comphelper/util/makefile.mk +++ b/comphelper/util/makefile.mk @@ -54,7 +54,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(UCBHELPERLIB) \ - $(VOSLIB) + SHL1DEPN= SHL1IMPLIB= i$(COMPHLP_TARGET) diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst index bd9c73582361..ebe88a70744e 100644 --- a/dtrans/prj/build.lst +++ b/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/l10ntools/layout/makefile.mk b/l10ntools/layout/makefile.mk index 95d6aa9863f4..9341e91b69a4 100644 --- a/l10ntools/layout/makefile.mk +++ b/l10ntools/layout/makefile.mk @@ -62,9 +62,8 @@ APP1OBJS = $(OBJFILES) APP1STDLIBS =\ $(TOOLSLIB)\ $(EXPATASCII3RDLIB)\ - $(VOSLIB)\ $(CPPULIB) \ - $(SALLIB) + $(SALLIB) # --- Targets ------------------------------------------------------ diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx index c4babe0da44f..b9a2b383cbcd 100644 --- a/l10ntools/layout/tralay.cxx +++ b/l10ntools/layout/tralay.cxx @@ -27,9 +27,11 @@ ************************************************************************/ #include <com/sun/star/xml/sax/SAXException.hpp> -#include <l10ntools/vosapp.hxx> #include <osl/file.hxx> +#include <osl/process.h> + +#include <l10ntools/vosapp.hxx> #include "export.hxx" #include "layoutparse.hxx" diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk index a8f17e8d6570..fc4203b0d9d3 100644 --- a/l10ntools/source/makefile.mk +++ b/l10ntools/source/makefile.mk @@ -81,7 +81,6 @@ APP1OBJS= $(OBJ)$/src_yy_wrapper.obj APP1STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) .IF "$(OS)"=="MACOSX" @@ -98,7 +97,7 @@ APP2RPATH= NONE .IF "$(OS)"!="MACOSX" .ENDIF -APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB) +APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) .IF "$(OS)"=="MACOSX" # static libs at end for OS X @@ -114,7 +113,6 @@ APP3RPATH= NONE .ENDIF APP3STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) .IF "$(OS)"=="MACOSX" # static libs at end for OS X @@ -125,7 +123,6 @@ APP4TARGET= gsiconv APP4OBJS= $(OBJ)$/utf8conv.obj $(OBJ)$/gsiconv.obj APP4STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) # tag checker for *.gsi @@ -133,7 +130,6 @@ APP5TARGET= gsicheck APP5OBJS= $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj APP5STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) # extractor and merger for *.cfg @@ -146,7 +142,6 @@ APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $ APP6STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) .IF "$(OS)"=="MACOSX" @@ -163,7 +158,6 @@ APP7RPATH= NONE APP7STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) .IF "$(OS)"=="MACOSX" @@ -173,7 +167,7 @@ APP7STDLIBS+= \ # #APP8TARGET= treeconfig #APP8OBJS= $(OBJ)$/treeconfig.obj $(OBJ)$/inireader.obj $(OBJ)$/export2.obj -#APP8STDLIBS=$(TOOLSLIB) $(SALLIB) $(VOSLIB) $(ICUINLIB) $(STLPORT) +#APP8STDLIBS=$(TOOLSLIB) $(SALLIB) $(ICUINLIB) $(STLPORT) # localizer for l10n framework APP9TARGET= localize_sl @@ -183,7 +177,6 @@ APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/utf8conv.obj $(OBJ)$/srciter.obj $(OBJ) APP9STDLIBS+= \ $(TOOLSLIB) \ - $(VOSLIB) \ $(ICUINLIB) \ $(ICUUCLIB) \ $(STLPORTLIB) \ diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index 89b00a779d3b..ac5b25902191 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -42,7 +42,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" @@ -56,9 +56,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 5e2f378603e9..8875e381e1b9 100644 --- a/sax/util/makefile.mk +++ b/sax/util/makefile.mk @@ -50,7 +50,6 @@ SHL1USE_EXPORTS=name SHL1LIBS= $(LIB1TARGET) SHL1STDLIBS= \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB)\ $(COMPHELPERLIB)\ diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk index 3cb87dcd33ad..9ea5e8d80b50 100644 --- a/svl/util/makefile.mk +++ b/svl/util/makefile.mk @@ -82,7 +82,6 @@ SHL1STDLIBS= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(SALLIB) diff --git a/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk index a1303343a503..e96724c668d9 100644 --- a/svtools/bmpmaker/makefile.mk +++ b/svtools/bmpmaker/makefile.mk @@ -50,7 +50,6 @@ APP1TARGET= $(TARGET) APP1STDLIBS = \ $(VCLLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) APP1OBJS= $(OBJ)$/bmp.obj \ @@ -66,7 +65,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 71bea788d8de..3f1eaac0efda 100644 --- a/svtools/source/config/test/makefile.mk +++ b/svtools/source/config/test/makefile.mk @@ -50,7 +50,6 @@ APP1STDLIBS= $(CPPULIB) \ $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(VCLLIB) diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 52bce268bfd2..c8b9eac6a30f 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -120,7 +120,6 @@ SHL1STDLIBS+= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) \ @@ -170,7 +169,6 @@ APP2STDLIBS+= -lsvl$(DLLPOSTFIX) APP2STDLIBS+= $(VCLLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) # --- Targets ------------------------------------------------------ diff --git a/svtools/workben/cui/makefile.mk b/svtools/workben/cui/makefile.mk index 2c7d06682c77..7c5a0bc4bed6 100644 --- a/svtools/workben/cui/makefile.mk +++ b/svtools/workben/cui/makefile.mk @@ -47,7 +47,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 9e50208b9ee9..3a0a81fec8bc 100644 --- a/svtools/workben/makefile.mk +++ b/svtools/workben/makefile.mk @@ -48,7 +48,6 @@ APP1STDLIBS= $(SVTOOLLIB) \ $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst index 2bf5fced6fd3..dc15fe7592b6 100644 --- a/toolkit/src2xml/include.lst +++ b/toolkit/src2xml/include.lst @@ -56,8 +56,6 @@ ../../vcl/unxlngi6.pro/inc ../../ure/unxlngi6.pro/inc ../../uui/unxlngi6.pro/inc -../../vos/inc -../../vos/unxlngi6.pro/inc ../../dbaccess/inc ../../dbaccess/source/ui/inc ../../dbaccess/source/inc diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk index 492d6f3105ed..ee0e79ae6b27 100644 --- a/tools/bootstrp/addexes2/makefile.mk +++ b/tools/bootstrp/addexes2/makefile.mk @@ -39,7 +39,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 41188d2117d0..06162f065682 100644 --- a/tools/bootstrp/makefile.mk +++ b/tools/bootstrp/makefile.mk @@ -81,12 +81,12 @@ LIB2OBJFILES=\ APP1TARGET= sspretty APP1OBJS= $(OBJ)$/sspretty.obj APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib -APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) +APP1STDLIBS=$(SALLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) APP2TARGET= rscdep APP2OBJS= $(OBJ)$/rscdep.obj APP2LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib -APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) +APP2STDLIBS= $(SALLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) .IF "$(HAVE_GETOPT)" != "YES" .IF "$(OS)"=="WNT" APP2STDLIBS+=gnu_getopt.lib @@ -99,7 +99,7 @@ APP2RPATH= NONE APP3TARGET= so_checksum APP3OBJS= $(OBJ)$/md5.obj \ $(OBJ)$/so_checksum.obj -APP3STDLIBS= $(TOOLSLIB) $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) +APP3STDLIBS= $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) DEPOBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 659ecfe66cab..1648d54e9942 100644 --- a/tools/prj/build.lst +++ b/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 1574addcf59c..7a2008c0b864 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -94,8 +94,8 @@ LIB1FILES+= $(SLB)$/dll.lib #SOLARLIBDIR=..\$(INPATH)\lib # bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen ! LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ - $(SOLARLIBDIR)\xrtl.lib \ - $(SOLARLIBDIR)\xvos.lib + $(SOLARLIBDIR)\xrtl.lib + SHL1STDLIBS+= $(WSOCK32LIB) .ENDIF .ENDIF # "$(BIG_TOOLS)"!="" @@ -107,7 +107,7 @@ SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1IMPLIB= itools SHL1USE_EXPORTS=name -SHL1STDLIBS+= $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(COMPHELPERLIB) +SHL1STDLIBS+= $(SALLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(COMPHELPERLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= $(SHELL32LIB) \ diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk index 73d5753fe233..97e7ebfa9a15 100644 --- a/tools/workben/makefile.mk +++ b/tools/workben/makefile.mk @@ -53,9 +53,9 @@ APP1LIBS = $(LB)$/itools.lib APP2TARGET = urltest APP2OBJS = $(OBJ)$/urltest.obj .IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2" -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 @@ -73,17 +73,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/unotools/util/makefile.mk b/unotools/util/makefile.mk index 8e725d2de2fa..9adb6d1466d1 100644 --- a/unotools/util/makefile.mk +++ b/unotools/util/makefile.mk @@ -63,7 +63,6 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(I18NISOLANGLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) SHL1LIBS=$(LIB1TARGET) diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk index 8691d0bcb626..64ef8309dfe3 100644 --- a/vcl/test/makefile.mk +++ b/vcl/test/makefile.mk @@ -52,7 +52,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 99d1c4537111..86bbf50bdfb2 100644 --- a/vcl/util/linksvp/makefile.mk +++ b/vcl/util/linksvp/makefile.mk @@ -54,7 +54,6 @@ SHL1STDLIBS=\ $(BASEBMPLIB)\ $(BASEGFXLIB)\ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) .ENDIF # GUIBASE unx diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index a5d868913627..20723bf7ada8 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -176,7 +176,6 @@ SHL1STDLIBS+=\ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(BASEGFXLIB) \ $(ICUUCLIB) \ @@ -301,7 +300,6 @@ SHL2STDLIBS=\ $(I18NPAPERLIB) \ $(I18NISOLANGLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(BASEGFXLIB) \ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ @@ -381,7 +379,6 @@ SHL4STDLIBS+=\ $(TOOLSLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(X11LINK_DYNAMIC) @@ -410,7 +407,6 @@ SHL5STDLIBS+=-l$(SHL2TARGET) SHL5STDLIBS+=\ $(VCLLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(X11LINK_DYNAMIC) @@ -440,7 +436,6 @@ SHL6STDLIBS+=\ $(VCLLIB) \ $(PSPLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(X11LINK_DYNAMIC) diff --git a/vcl/workben/makefile.mk b/vcl/workben/makefile.mk index 67c0289cc24f..66bca942f74c 100644 --- a/vcl/workben/makefile.mk +++ b/vcl/workben/makefile.mk @@ -60,7 +60,6 @@ APP1STDLIBS= $(CPPULIB) \ $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) @@ -92,7 +91,6 @@ APP3STDLIBS= $(CPPULIB) \ $(COMPHELPERLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) @@ -110,7 +108,6 @@ APP4STDLIBS= $(CPPULIB) \ $(VCLLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) @@ -125,7 +122,6 @@ APP5STDLIBS= $(CPPULIB) \ $(VCLLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) diff --git a/vos/docu/.html b/vos/docu/.html deleted file mode 100644 index bce575d49d92..000000000000 --- a/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öckler</A>, <A HREF="mailto:wunderling@zib.de"> Roland Wunderling </A><br>contact: <A HREF="mailto:doc++@zib.de"> doc++@zib.de </a>
\ No newline at end of file diff --git a/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx deleted file mode 100644 index 60e6e95fa66d..000000000000 --- a/vos/inc/vos/execabl.hxx +++ /dev/null @@ -1,154 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_EXECABL_HXX_ -#define _VOS_EXECABL_HXX_ - -# include <vos/types.hxx> -# include <vos/refernce.hxx> - -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 NAMESPACE_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 NAMESPACE_VOS(IExecutable), - public NAMESPACE_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_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/istream.hxx b/vos/inc/vos/istream.hxx deleted file mode 100644 index fbb3adccc4b0..000000000000 --- a/vos/inc/vos/istream.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_ISTREAM_HXX_ -#define _VOS_ISTREAM_HXX_ - -#include "sal/types.h" -# include <vos/types.hxx> - -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_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx deleted file mode 100644 index fa9a16c208c2..000000000000 --- a/vos/inc/vos/macros.hxx +++ /dev/null @@ -1,161 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_MACROS_HXX_ -#define _VOS_MACROS_HXX_ - - -#include <osl/endian.h> - -// ********************************************************************* -// 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_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx deleted file mode 100644 index 764ea9fe0a32..000000000000 --- a/vos/inc/vos/object.hxx +++ /dev/null @@ -1,195 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_OBJECT_HXX_ -#define _VOS_OBJECT_HXX_ - -# include <vos/types.hxx> -# include <vos/macros.hxx> - -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_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx deleted file mode 100644 index ddc1c918fac2..000000000000 --- a/vos/inc/vos/process.hxx +++ /dev/null @@ -1,320 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_PROCESS_HXX_ -#define _VOS_PROCESS_HXX_ - -# include <rtl/ustring.hxx> -#include <osl/mutex.hxx> -#include <osl/security.hxx> -# include <vos/object.hxx> -#include <osl/process.h> - -namespace vos -{ - -class OProcess; - -/** helper class to fill a vector of command line arguments - */ -class OArgumentList -{ - sal_uInt32 n_Args; - rtl_uString** m_aVec; - -public: - - OArgumentList(); - OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument1, ... ); - // switched argument list to avoid ambiguity with previous constructor. - OArgumentList( const ::rtl::OUString aArgumentList[], sal_uInt32 nArgs ); - - OArgumentList( const OArgumentList& rOther); - - OArgumentList& operator=( const OArgumentList& rOther); - - virtual ~OArgumentList(); - - friend class OProcess; -}; - -/** helper class to fill a vector of environment settings - */ -class OEnvironment -{ - sal_Int32 n_Vars; - rtl_uString** m_aVec; - -public: - - OEnvironment(); - OEnvironment( sal_Int32 nVars, const ::rtl::OUString* aVariable1, ... ); - // switched argument list to avoid ambiguity with previous constructor. - OEnvironment( const ::rtl::OUString aVariableList[], sal_Int32 nVars ); - - OEnvironment( const OEnvironment& rOther ); - - OEnvironment& operator=( const OEnvironment& rOther ); - - virtual ~OEnvironment(); - - friend class OProcess; -}; - - -/** startup child processes. - @see OStartupInfo - Used for starting an monitoring child processes with special features: - <ul><li>setting enviroments, - <li>setting working directories, - <li>setting user rights and security, - <li>providing ioresources like file descriptors and sockets.</ul> -*/ -class OProcess : public OObject -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OProcess, vos)); - -public: - - /** Options for execution mode: - */ - enum TProcessOption - { - TOption_Wait = osl_Process_WAIT, // wait for completion - TOption_SearchPath = osl_Process_SEARCHPATH, // search path for executable - TOption_Detached = osl_Process_DETACHED, // run detached - TOption_Normal = osl_Process_NORMAL, // run in normal window - TOption_Hidden = osl_Process_HIDDEN, // run hidden - TOption_Minimized = osl_Process_MINIMIZED, // run in minimized window - TOption_Maximized = osl_Process_MAXIMIZED, // run in maximized window - TOption_FullScreen = osl_Process_FULLSCREEN // run in fullscreen window - }; - - /** Errorcodes: - */ - enum TProcessError { - E_None = osl_Process_E_None, /* no error */ - E_NotFound = osl_Process_E_NotFound, /* image not found */ - E_TimedOut = osl_Process_E_TimedOut, /* timout occured */ - E_NoPermission = osl_Process_E_NoPermission, /* permission denied */ - E_Unknown = osl_Process_E_Unknown, /* unknown error */ - E_InvalidError = osl_Process_E_InvalidError /* unmapped error */ - }; - - enum TDescriptorFlags - { - TFlags_None = osl_Process_DFNONE, - TFlags_Wait = osl_Process_DFWAIT - }; - - enum TProcessData - { - TData_Identifier = osl_Process_IDENTIFIER, - TData_ExitCode = osl_Process_EXITCODE, - TData_CpuTimes = osl_Process_CPUTIMES, - TData_HeapUsage = osl_Process_HEAPUSAGE - }; - - struct TProcessInfo : public oslProcessInfo - { - TProcessInfo() { Size = sizeof(*this); } - }; - - typedef oslProcessIdentifier TProcessIdentifier; - - /** Creating a process object by naming the executable. - Does not yet start the process. - @see execute - */ - - OProcess( ); - - OProcess(const ::rtl::OUString& strImageName); - - OProcess(const ::rtl::OUString& strImageName, - const ::rtl::OUString& strWorkingDirectory); - - /// destroying a process object - virtual ~OProcess(); - - SAL_CALL operator oslProcess() - { return m_Process; } - - SAL_CALL operator oslProcess() const - { return m_Process; } - - static OProcess* SAL_CALL getProcess(TProcessIdentifier Identifier); - - /** execute the given process. - This process becomes a child of the caller. - If there are any ioresources provided from the calling process, this - function returns only, if the child process calls OStartupInfo::acceptIOResource(). - @param Options [in] describes the execution mode. - @return only not eNONE, if too much enviroments are added. - @see OStartupInfo::acceptIOResource - */ - TProcessError SAL_CALL execute(TProcessOption Options, - const OArgumentList& aArgumentList = OArgumentList(), - const OEnvironment& aEnvironment = OEnvironment() - ); - - /** execute the given process with the specified security. - This process becomes a child of the caller. - The process is executed with the rights of the user, for whom the security object is created. - If there are any ioresources provided from the calling process, this - function returns only, if the child process calls OStartupInfo::acceptIOResource(). - @param Options [in] describes the execution mode. - @param Security [in] is a given security object for one logged in user. - @return eNONE, if the proccess could be executed, otherwise an errorcode. - @see OStartupInfo::acceptIOResource - */ - TProcessError SAL_CALL execute(TProcessOption Options, - const osl::Security &Security, - const OArgumentList& aArgumentList = OArgumentList(), - const OEnvironment& aEnvironment = OEnvironment() - ); - - TProcessError SAL_CALL terminate(); - - TProcessError SAL_CALL getInfo(TProcessData Data, TProcessInfo* pInfo) const; - - static TProcessError SAL_CALL getCurrentInfo(TProcessData Data, TProcessInfo* pInfo); - - /** wait for the completation of this child process - @return eNONE if child process exits, otherwise nothing. - */ - TProcessError SAL_CALL join(); - -protected: - const ::rtl::OUString m_strImageName; - const ::rtl::OUString m_strDirectory; - - oslProcess m_Process; -}; - -/** informations for client processes provided by the parent. - @see OProcess -*/ - - -class OStartupInfo : public OObject -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStartupInfo, vos)); - -public: - /** Errorcodes: - */ - enum TStartupError { - E_None = osl_Process_E_None, /* no error */ - E_NotFound = osl_Process_E_NotFound, /* image not found */ - E_TimedOut = osl_Process_E_TimedOut, /* timout occured */ - E_NoPermission = osl_Process_E_NoPermission, /* permission denied */ - E_Unknown = osl_Process_E_Unknown, /* unknown error */ - E_InvalidError = osl_Process_E_InvalidError /* unmapped error */ - }; - - /** Constructor. - */ - OStartupInfo(); - - /** Destructor - */ - ~OStartupInfo(); - - /** @return the number of command line arguments. - */ - sal_uInt32 SAL_CALL getCommandArgCount(); - - /** get the nArg-th command argument passed to the main-function of this process. - @param nArg [in] the number of arguments to return. - @param strCommandArg [out] the string that receives the argument. - @return eNONE - */ - TStartupError SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg); - - TStartupError SAL_CALL getExecutableFile(::rtl::OUString& strImageName) - const; - - /** Get the value of one enviroment variable. - @param Name [in] denotes the name of the variable to get. - @param Buffer [out] is the buffer where the value of this variable is returned. - @param Max [in] is the size of this buffer. - @return eNONE, if the variable exist in the enviroment, otherwise False. - */ - TStartupError SAL_CALL getEnvironment(const ::rtl::OUString& strVar, ::rtl::OUString& strValue); -}; - - - -/** get extended arguments from command line and an argument file - the file name is given on the command line as "@filename" - (filename must be in our UNC notation!) - enumeration starts with 0 (i.e. argv[1]) - each line in the file will be treated as one argument - @see also OProcess and OStartupInfo -*/ - -class OExtCommandLineImpl; - -class OExtCommandLine : public OObject -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OExtCommandLine, vos)); - static NAMESPACE_VOS(OExtCommandLineImpl)* pExtImpl; - -public: - - /** Constructor. - */ - OExtCommandLine(); - - /** Destructor - */ - virtual ~OExtCommandLine(); - - /** @return the number of extended command line arguments. - */ - sal_uInt32 SAL_CALL getCommandArgCount(); - - - /** get the nArg-th extended command argument - @param nArg [in] the number of extended argument to return. - @param strCommandArg [out] the string that receives the argument. - @return sal_True if the nArg-th argument has been retriveded successfully - @return sal_False on all other cases - */ - sal_Bool SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg); - - -}; - -} - -#endif // _VOS_PROCESS_HXX_ - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/ref.inl b/vos/inc/vos/ref.inl deleted file mode 100644 index 6817465666f9..000000000000 --- a/vos/inc/vos/ref.inl +++ /dev/null @@ -1,192 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#if (defined(OS2) && defined(ICC)) -#define CAST_TO_IREFERENCE(p) ((IReference*)(p)) -#else -#define CAST_TO_IREFERENCE(p) (p) -#endif - -template <class T> -inline ORef<T>::ORef() -{ - m_refBody= 0; -} - -template <class T> -inline ORef<T>::ORef(T* pBody) -{ - m_refBody= pBody; - - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->acquire(); -} - -template <class T> -inline ORef<T>::ORef(const ORef<T>& handle) -{ - m_refBody= handle.m_refBody; - - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->acquire(); -} - -template <class T> -inline ORef<T>::~ORef() -{ - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->release(); -} - -template <class T> -inline ORef<T>& ORef<T>::operator= (const ORef<T>& handle) -{ - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->release(); - - m_refBody= handle.m_refBody; - - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->acquire(); - - return *this; -} - -template <class T> -inline void ORef<T>::bind(T* pBody) -{ - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->release(); - - m_refBody= pBody; - - if (m_refBody) - CAST_TO_IREFERENCE(m_refBody)->acquire(); -} - -template <class T> -inline ORef<T>& ORef<T>::unbind() -{ - if (m_refBody) - { - CAST_TO_IREFERENCE(m_refBody)->release(); - m_refBody = 0; - } - return *this; -} - -template <class T> -inline void ORef<T>::operator= (T* pBody) -{ - bind(pBody); -} - -template <class T> -inline T& ORef<T>::operator() () const -{ - OSL_PRECOND(m_refBody, "ORef::operator(): can't deref nil body!"); - return *m_refBody; -} - -template <class T> -inline T& ORef<T>::operator* () const -{ - OSL_PRECOND(m_refBody, "ORef::operator*: can't deref nil body!"); - return *m_refBody; -} - -template <class T> -inline T* ORef<T>::operator->() const -{ - OSL_PRECOND(m_refBody, "ORef::operator->: nil body!"); - return m_refBody; -} - -template <class T> -inline T& ORef<T>::getBody() const -{ - OSL_PRECOND(m_refBody, "ORef::getBody(): can't deref nil body!"); - return *m_refBody; -} - -template <class T> -inline T* ORef<T>::getBodyPtr() const -{ - // might be nil - return m_refBody; -} - -template <class T> -inline sal_Bool ORef<T>::isEmpty() const -{ - return m_refBody == 0; -} - -template <class T> -inline sal_Bool ORef<T>::isValid() const -{ - return m_refBody != 0; -} - -template <class T> -inline sal_Bool ORef<T>::isEqualBody(const ORef<T>& handle) const -{ - return m_refBody == handle.m_refBody; -} - -template <class T> -inline sal_Bool ORef<T>::operator== (const ORef<T>& handle) const -{ - return m_refBody == handle.m_refBody; -} - -template <class T> -inline sal_Bool ORef<T>::operator!= (const ORef<T>& handle) const -{ - return m_refBody != handle.m_refBody; -} - -template <class T> -inline sal_Bool ORef<T>::operator== (const T* pBody) const -{ - return m_refBody == pBody; -} - -template <class T> -inline sal_Bool ORef<T>::operator< (const ORef<T>& handle) const -{ - return m_refBody < handle.m_refBody; -} - -template <class T> -inline sal_Bool ORef<T>::operator> (const ORef<T>& handle) const -{ - return m_refBody > handle.m_refBody; -} - - diff --git a/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx deleted file mode 100644 index e480fd46468f..000000000000 --- a/vos/inc/vos/refernce.hxx +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_REFERNCE_HXX_ -#define _VOS_REFERNCE_HXX_ - -# include <vos/types.hxx> -# include <osl/interlck.h> -# include <vos/object.hxx> - -namespace vos -{ - -/** Interface for refernce-counting -*/ -class IReference -{ -public: - - IReference() { } - virtual ~IReference() { } - - typedef oslInterlockedCount RefCount; - - virtual RefCount SAL_CALL acquire()=0; - virtual RefCount SAL_CALL release()=0; - - virtual RefCount SAL_CALL referenced() const=0; -}; - -class ORefCount -{ -public: - typedef IReference::RefCount RefCount; - - ORefCount() { m_RefCount = 0; } - ORefCount(RefCount n) { m_RefCount = n; } - virtual ~ORefCount(); - - RefCount SAL_CALL acquire() { return (osl_incrementInterlockedCount(&m_RefCount)); }; - RefCount SAL_CALL release() { return (osl_decrementInterlockedCount(&m_RefCount)); }; - - RefCount SAL_CALL operator++() { return acquire(); } - // don't implement the postfix operator, it won't function this way! - - RefCount SAL_CALL operator--() { return release(); } - // don't implement the postfix operator, it won't function this way! - - RefCount SAL_CALL referenced() const - { return (m_RefCount); } - -protected: - RefCount m_RefCount; - -private: - // disable copy/assignment - ORefCount(const ORefCount&); - ORefCount& SAL_CALL operator= (const ORefCount&); -}; - -class OReference : public NAMESPACE_VOS(IReference) -{ -public: - OReference(); - virtual ~OReference(); - - virtual RefCount SAL_CALL acquire(); - virtual RefCount SAL_CALL release(); - - virtual RefCount SAL_CALL referenced() const - { return (m_RefCount.referenced()); } - -protected: - ORefCount m_RefCount; - -private: - // disable copy/assignment - OReference(const OReference&); - OReference& SAL_CALL operator= (const OReference&); -}; - -} - -#endif // _VOS_REFERNCE_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/refobj.hxx b/vos/inc/vos/refobj.hxx deleted file mode 100644 index 0bf5988863e4..000000000000 --- a/vos/inc/vos/refobj.hxx +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_REFOBJ_HXX_ -#define _VOS_REFOBJ_HXX_ - -/** - ORefObj<T> - - template type to implement handle/body behaviour - with reference-counting. -*/ - -#include <vos/refernce.hxx> -#include <osl/diagnose.h> - -namespace vos -{ - -template <class T> -class ORefObj : public IReference -{ -public: - ORefObj(const T& Obj); - - inline ~ORefObj(); - - virtual RefCount SAL_CALL acquire() - { return (m_RefCount.acquire()); } - virtual RefCount SAL_CALL release() - { return (m_RefCount.release()); } - virtual RefCount SAL_CALL referenced() const - { return (m_RefCount.referenced()); } - - T& SAL_CALL operator=(const T& Obj); - - SAL_CALL operator T&(); - SAL_CALL operator const T&() const; - - T& SAL_CALL operator() (); - const T& SAL_CALL operator() () const; - - const T& SAL_CALL getObj() const; - T& SAL_CALL getObj(); - -protected: - T m_Obj; - ORefCount m_RefCount; - -private: - ORefObj(const ORefObj<T>& handle); - ORefObj<T>& SAL_CALL operator= (const ORefObj<T>& handle); -}; - -// include template implementation -#include <vos/refobj.inl> - -} - - -#endif // _VOS_REF_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/refobj.inl b/vos/inc/vos/refobj.inl deleted file mode 100644 index 3a2f9fc1df43..000000000000 --- a/vos/inc/vos/refobj.inl +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -template <class T> -ORefObj<T>::ORefObj(const T& Obj) -{ - m_Obj = Obj; - - m_RefCount.acquire(); -} - -template <class T> -inline ORefObj<T>::~ORefObj() -{ - OSL_ASSERT(m_RefCount.referenced() == 0); -} - -template <class T> -inline T& ORefObj<T>::operator=(const T& Obj) -{ - m_Obj = Obj; - - return m_Obj; -} - -template <class T> -inline ORefObj<T>::operator T&() -{ - return m_Obj; -} - -template <class T> -inline ORefObj<T>::operator const T&() const -{ - return m_Obj; -} - -template <class T> -inline T& ORefObj<T>::operator() () -{ - return m_Obj; -} - -template <class T> -inline const T& ORefObj<T>::operator() () const -{ - return m_Obj; -} - -template <class T> -inline T& ORefObj<T>::getObj() -{ - return m_Obj; -} - -template <class T> -inline const T& ORefObj<T>::getObj() const -{ - return m_Obj; -} - diff --git a/vos/inc/vos/runnable.hxx b/vos/inc/vos/runnable.hxx deleted file mode 100644 index e66717333b01..000000000000 --- a/vos/inc/vos/runnable.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_RUNNABLE_HXX_ -#define _VOS_RUNNABLE_HXX_ - -# include <vos/types.hxx> -# include <vos/refernce.hxx> - -namespace vos -{ - - -/** IRunnable - - The IRunnable-interface is to be understood as wrapper around - your application-code, which allows it to be executed asynchronously. - - - @author Bernd Hofner - @version 0.1 -*/ - -class IRunnable -{ -public: - - IRunnable() { } - virtual ~IRunnable() { } - - - /** overload to implement your functionality. - */ - virtual void SAL_CALL run()= 0; - -}; - - -} - - -#endif // _VOS_RUNNABLE_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx deleted file mode 100644 index 7a1bb3517b05..000000000000 --- a/vos/inc/vos/stream.hxx +++ /dev/null @@ -1,287 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_STREAM_HXX_ -#define _VOS_STREAM_HXX_ - -# include <vos/types.hxx> -# include <vos/object.hxx> -# include <vos/istream.hxx> - -namespace vos -{ - -/** Adds seeking capabilities to IStream -*/ -class IPositionableStream : public NAMESPACE_VOS(IStream) -{ - -public: - - typedef sal_Int32 Offset; - -public: - - /// - virtual sal_Bool SAL_CALL seekTo(Offset position) const = 0; - - /// - virtual sal_Bool SAL_CALL seekRelative(Offset change) const = 0; - - /// - virtual sal_Bool SAL_CALL seekToEnd() const = 0; - - /// - virtual sal_Bool SAL_CALL changeSize(sal_uInt32 new_size) = 0; - - /// - virtual sal_uInt32 SAL_CALL getSize() const = 0; - - - /// - virtual Offset SAL_CALL getOffset() const = 0; - - -protected: - IPositionableStream() { } - virtual ~IPositionableStream() { } - -}; - - -/** Implements IPositionableStream -*/ -class OStream : public NAMESPACE_VOS(OObject), - public NAMESPACE_VOS(IPositionableStream) -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos)); - -public: - - /// - OStream(IPositionableStream& rStream); - - /// - virtual ~OStream (); - - // ----------------- Read operations ------------------------- - - /// - virtual sal_Int32 SAL_CALL read(void* pbuffer, sal_uInt32 n) const; - - /// - sal_Int32 SAL_CALL read(IPositionableStream::Offset offset, - void* pbuffer, - sal_uInt32 n) const; - - /// - inline sal_Bool SAL_CALL read(sal_Int32& value) const; - - /// - inline sal_Bool SAL_CALL read(sal_Int16& value) const; - - /// - inline sal_Bool SAL_CALL read(sal_Char& value) const; - - /// - inline sal_Bool SAL_CALL read(sal_uInt8& value) const; - - // ----------------- Write operations ------------------------ - - /// - virtual sal_Int32 SAL_CALL write(const void* pbuffer, sal_uInt32 n); - - /// - sal_Int32 SAL_CALL write(IPositionableStream::Offset offset, - const void* pbuffer, - sal_uInt32 n); - /// - inline sal_Bool SAL_CALL write(sal_Int32 value); - - /// - inline sal_Bool SAL_CALL write(sal_Int16 value); - - /// - inline sal_Bool SAL_CALL write(sal_Char value); - - /// - inline sal_Bool SAL_CALL write(sal_uInt8 value); - - /// - sal_Bool SAL_CALL append(void* pbuffer, sal_uInt32 n); // Write at the end of the Stream. - - // ------------- Positioning and sizing operations ---------- - - /// - inline sal_Bool SAL_CALL seekToBegin() const; - - // ----------------- Stream interface ------------------------ - - /// - virtual sal_Bool SAL_CALL seekTo(IPositionableStream::Offset pos) const; - - /// - virtual sal_Bool SAL_CALL seekToEnd() const; - - /// - virtual sal_Bool SAL_CALL seekRelative(IPositionableStream::Offset change) const; - - /// - virtual sal_Bool SAL_CALL changeSize(sal_uInt32 new_size); - - /// - virtual sal_uInt32 SAL_CALL getSize() const; - - /// - virtual sal_Bool SAL_CALL isEof() const; - - /// - virtual IPositionableStream::Offset SAL_CALL getOffset() const; - -protected: - IPositionableStream& m_rStream; - - // ----------------- Stream operators ------------------------ - - friend const OStream& operator>> (OStream& rStream, sal_Int32& value); - friend const OStream& operator>> (OStream& rStream, sal_Int16& value); - friend const OStream& operator>> (OStream& rStream, sal_uInt8& value); - friend const OStream& operator>> (OStream& rStream, sal_Char& value); - friend OStream& operator<< (OStream& rStream, sal_Int32 value); - friend OStream& operator<< (OStream& rStream, sal_Int16 value); - friend OStream& operator<< (OStream& rStream, sal_uInt8 value); - friend OStream& operator<< (OStream& rStream, sal_Char value); -}; - -inline sal_Bool OStream::read(sal_Int32& value) const -{ - return (read(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::read(sal_Int16& value) const -{ - return (read(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::read(sal_Char& value) const -{ - return (read(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::read(sal_uInt8& value) const -{ - return (read(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::write(sal_Int32 value) -{ - return (write(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::write(sal_Int16 value) -{ - return (write(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::write(sal_Char value) -{ - return (write(&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::write(sal_uInt8 value) -{ - return (write((sal_uInt8*)&value, sizeof(value)) == sizeof(value)); -} - -inline sal_Bool OStream::seekToBegin() const -{ - return (seekTo(0L)); -} - -inline const OStream& operator>> (OStream& rStream, sal_Int32& value) -{ - rStream.read(value); - - return (rStream); -} - -inline const OStream& operator>> (OStream& rStream, sal_Int16& value) -{ - rStream.read(value); - - return (rStream); -} - -inline const OStream& operator>> (OStream& rStream, sal_uInt8& value) -{ - rStream.read(value); - - return (rStream); -} - -inline const OStream& operator>> (OStream& rStream, sal_Char& value) -{ - rStream.read(value); - - return (rStream); -} - -inline OStream& operator<< (OStream& rStream, sal_Int32 value) -{ - rStream.write(value); - - return (rStream); -} - -inline OStream& operator<< (OStream& rStream, sal_Int16 value) -{ - rStream.write(value); - - return (rStream); -} - -inline OStream& operator<< (OStream& rStream, sal_uInt8 value) -{ - rStream.write(value); - - return (rStream); -} - -inline OStream& operator<< (OStream& rStream, sal_Char value) -{ - rStream.write(value); - - return (rStream); -} - -} - -#endif // _VOS_STREAM_HXX_ - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx deleted file mode 100644 index 2530b29586af..000000000000 --- a/vos/inc/vos/thread.hxx +++ /dev/null @@ -1,237 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_THREAD_HXX_ -#define _VOS_THREAD_HXX_ - -# include <vos/types.hxx> -# include <vos/object.hxx> -# include <osl/thread.h> -# include <osl/conditn.h> -# include <vos/runnable.hxx> - -#include <osl/time.h> - -namespace vos -{ - -extern "C" typedef void ThreadWorkerFunction_impl(void *); -ThreadWorkerFunction_impl threadWorkerFunction_impl; - -/** OThread is an objectoriented interface for threads. - This class should be the base class for all objects using threads. The - main working function is the run() method and should be overriden in the - derived class. To support soft termination of a thread, yield() should - be called in regular intervalls and the return value should be checked. - If yield returned False the run method should return. - - @author Bernd Hofner - @version 1.0 -*/ - -class OThread : public NAMESPACE_VOS(IRunnable), - public NAMESPACE_VOS(OObject) -{ - - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThread, vos)); - - oslCondition m_aCondition; - -public: - /** priority of thread. - */ - enum TThreadPriority - { - TPriority_Highest = osl_Thread_PriorityHighest, - TPriority_AboveNormal = osl_Thread_PriorityAboveNormal, - TPriority_Normal = osl_Thread_PriorityNormal, - TPriority_BelowNormal = osl_Thread_PriorityBelowNormal, - TPriority_Lowest = osl_Thread_PriorityLowest, - TPriority_Unknown = osl_Thread_PriorityUnknown - }; - - /** - */ - enum TThreadSleep - { - TSleep_Normal, - TSleep_Cancel, - TSleep_Pending, - TSleep_Active, - TSleep_Error, - TSleep_Unknown - }; - - typedef oslThreadIdentifier TThreadIdentifier; - - /// Constructor - OThread(); - - /// Destructor kills thread if neccessary - virtual ~OThread(); - - /** Create running instance of a thread. - @returns True if thread could be created. - */ - sal_Bool SAL_CALL create(); - - /** Create suspended instance of a thread. - @returns True if thread could be created. - */ - sal_Bool SAL_CALL createSuspended(); - - /// Suspend a runnng thread - void SAL_CALL suspend(); - - /// Resume a suspended thread - void SAL_CALL resume(); - - /** Tries to kill the thread. - will not block and might not succeed when run() won't heed isTerminationRequested(). - */ - virtual void SAL_CALL terminate(); - - /// Kill thread hard and block until it is actually gone - virtual void SAL_CALL kill(); - - /// Block till thread is terminated - void SAL_CALL join(); - - /// Check if thread is running. - sal_Bool SAL_CALL isRunning(); - - /** Change thread priority. - The valid priority levels are: - <ul> - <li>ThreadPriorityHighest, - <li>ThreadPriorityAboveNormal, - <li>ThreadPriorityNormal, - <li>ThreadPriorityBelowNormal, - <li>ThreadPriorityLowest, - </ul> - */ - void SAL_CALL setPriority(TThreadPriority Priority); - - /** Query thread priority. - Valid return values are: - <ul> - <li>ThreadPriorityHighest, - <li>ThreadPriorityAboveNormal, - <li>ThreadPriorityNormal, - <li>ThreadPriorityBelowNormal, - <li>ThreadPriorityLowest, - <li>ThreadPriorityUnknown (returned if thread is killed) - </ul> - */ - TThreadPriority SAL_CALL getPriority(); - - TThreadIdentifier SAL_CALL getIdentifier() const; - - static TThreadIdentifier SAL_CALL getCurrentIdentifier(); - - /** Let thread sleep a specified amout of time. - @param Delay specifies the number of time to sleep. - */ - TThreadSleep SAL_CALL sleep(const TimeValue& Delay); - - /** Awake the sleeping thread. - @returns False if at least one of the handles is invalid - or the thread is not sleeping. - */ - sal_Bool SAL_CALL awake(); - - /** Let current thread wait a specified amout of time. - @param Delay specifies the number of time - to wait. Note, if you need to interrupt the waiting operation - use sleep instead. - */ - static void SAL_CALL wait(const TimeValue& Delay); - - /** Reschedules threads. - Call within your loop if you - want other threads offer some processing time. - This method is static, so it might be used by the - main-thread. - */ - static void SAL_CALL yield(); - -protected: - - /// Working method which should be overridden. - virtual void SAL_CALL run() = 0; - - /** Checks if thread should terminate. - isTerminationRequested() will return True if someone called - terminate(). - @return True if thread should terminate, False if he can continue. - */ - virtual sal_Bool SAL_CALL schedule(); - - /** Called when run() is done. - You might want to override it to do some cleanup. - */ - virtual void SAL_CALL onTerminated(); - -protected: - oslThread m_hThread; - sal_Bool m_bTerminating; - - friend void threadWorkerFunction_impl(void *); -}; - -class OThreadData : public NAMESPACE_VOS(OObject) -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos)); - -public: - /// Create a thread specific local data key - OThreadData( oslThreadKeyCallbackFunction = 0 ); - - /// Destroy a thread specific local data key - virtual ~OThreadData(); - - /** Set the data associated with the data key. - @returns True if operation was successfull - */ - sal_Bool SAL_CALL setData(void *pData); - - /** Get the data associated with the data key. - @returns The data asscoitaed with the data key or - NULL if no data was set - */ - void* SAL_CALL getData(); - -protected: - oslThreadKey m_hKey; -}; - -} - -#endif // _VOS_THREAD_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/types.hxx b/vos/inc/vos/types.hxx deleted file mode 100644 index 5cc12913b64c..000000000000 --- a/vos/inc/vos/types.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _VOS_TYPES_HXX_ -#define _VOS_TYPES_HXX_ - - -/* disable some warnings for MS-C */ -#ifdef _MSC_VER -# pragma warning (disable : 4786) // 4786: truncated names (longer 255 chars) -# pragma warning (disable : 4355) // 4355: this used in initializer-list -#endif - -#endif //_VOS_TYPES_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/xception.hxx b/vos/inc/vos/xception.hxx deleted file mode 100644 index 663464d71b77..000000000000 --- a/vos/inc/vos/xception.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _XCEPTION_HXX_ -#define _XCEPTION_HXX_ - -#include <vos/object.hxx> - -#ifdef _MSC_VER -#pragma warning( disable : 4290 ) -#endif - -namespace vos -{ - -/* avoid clashes with <vos/exception.hxx> */ -#define OException OBaseException - -/* - * Macros for true try/catch based Exception Handling (public) - * based on true rtti type checking - */ - -#define THROW_AGAIN throw; -#define THROW( Constructor ) throw Constructor; - -/* - * declaration of the exceptions that may be thrown by a function - * (e.g.) void myfunction(sal_Int32 a) throw ( std::bad_alloc ); - * is not fully supported by all compilers - */ - -#define THROWS( ARG ) throw ARG - -/* - * just a base class for further exceptions - */ - -class OException : public OObject -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OException, vos)); - -public: - virtual ~OException(); - OException() {} - OException( const OException & ) : OObject() {} - - OException& SAL_CALL operator=(const OException&) - { return *this; } -}; - -} - -#endif /* _XCEPTION_HXX_ */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/prj/build.lst b/vos/prj/build.lst deleted file mode 100644 index acc2d2f7b2a3..000000000000 --- a/vos/prj/build.lst +++ /dev/null @@ -1,6 +0,0 @@ -vo vos : sal solenv NULL -vo vos usr1 - all vo_mkout NULL -vo vos\inc\vos get - all vo_inc NULL -vo vos\prj get - all vo_prj NULL -vo vos\source nmake - all vo_sou NULL -vo vos\util nmake - all vo_util vo_sou NULL diff --git a/vos/prj/d.lst b/vos/prj/d.lst deleted file mode 100644 index 94d46bd59a68..000000000000 --- a/vos/prj/d.lst +++ /dev/null @@ -1,15 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\vos -..\version.mk %_DEST%\inc%_EXT%\vos\version.mk -..\inc\vos\*.h %_DEST%\inc%_EXT%\vos\*.h -..\inc\vos\*.hxx %_DEST%\inc%_EXT%\vos\*.hxx -..\inc\vos\*.inl %_DEST%\inc%_EXT%\vos\*.inl - -..\%__SRC%\lib\avos.lib %_DEST%\lib%_EXT%\avos.lib -..\%__SRC%\lib\ivos.lib %_DEST%\lib%_EXT%\ivos.lib -..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\slb\cppvos.lib %_DEST%\lib%_EXT%\xvos.lib - -..\%__SRC%\bin\vos*.dll %_DEST%\bin%_EXT%\vos*.dll diff --git a/vos/source/dllentry.cxx b/vos/source/dllentry.cxx deleted file mode 100644 index 382e612a8835..000000000000 --- a/vos/source/dllentry.cxx +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <windows.h> -#include <winsock.h> - - -#ifdef SHARED - -sal_Int32 CALLBACK LibMain(HINSTANCE hinst, WORD wDataSeg, WORD cbHeap, LPSTR lpszCmdLine ) -{ - HGLOBAL hgblClassStruct; - LPWNDCLASS lpClassStruct; - static HINSTANCE hinstLib = NULL; - - /* Has the library been initialized yet? */ - if (hinstLib == NULL) - { - WORD wVersionRequested; - WSADATA wsaData; - sal_Int32 error; - - - wVersionRequested = 0x0101; - error = WSAStartup( wVersionRequested, &wsaData ); - if (error) - { - } - else - hinstLib = hinst; - } - - return (hinstLib ? TRUE : FALSE); /* return TRUE = success; FALSE = fail */ -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk deleted file mode 100644 index 84f53a4d0719..000000000000 --- a/vos/source/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=vos -TARGET=cppvos -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/object.obj \ - $(SLO)$/refernce.obj \ - $(SLO)$/thread.obj \ - $(SLO)$/stream.obj \ - $(SLO)$/process.obj \ - $(SLO)$/xception.obj - - -.IF "$(UPDATER)"=="YES" -OBJFILES= \ - $(OBJ)$/object.obj \ - $(OBJ)$/refernce.obj \ - $(OBJ)$/thread.obj \ - $(OBJ)$/stream.obj \ - $(OBJ)$/process.obj \ - $(OBJ)$/xception.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - diff --git a/vos/source/object.cxx b/vos/source/object.cxx deleted file mode 100644 index e60033f0b6b5..000000000000 --- a/vos/source/object.cxx +++ /dev/null @@ -1,168 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <string.h> - -#include <rtl/alloc.h> -#include <rtl/memory.h> - -#include <osl/diagnose.h> - -#include <vos/object.hxx> - -using namespace vos; - -///////////////////////////////////////////////////////////////////////////// -// Object super class - -VOS_NAMESPACE(OClassInfo, vos) VOS_NAMESPACE(OObject, vos)::__ClassInfo__(VOS_CLASSNAME(OObject, vos), sizeof(VOS_NAMESPACE(OObject, vos))); - -OObject::OObject() -{ -} - -OObject::OObject(const OCreateParam&) -{ -} - -OObject::~OObject() -{ -} - -void* OObject::operator new(size_t size) -{ - void* p = rtl_allocateMemory(size); - - OSL_ASSERT(p != NULL); - - return (p); -} - -void* OObject::operator new(size_t, void* p) -{ - return (p); -} - -void OObject::operator delete(void* p) -{ - rtl_freeMemory(p); -} - -const OClassInfo& OObject::classInfo() -{ - return (__ClassInfo__); -} - -const OClassInfo& OObject::getClassInfo() const -{ - return (VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos))); -} - -sal_Bool OObject::isKindOf(const OClassInfo& rClass) const -{ - OSL_ASSERT(this != NULL); - - const OClassInfo& rClassThis = getClassInfo(); - - return (rClassThis.isDerivedFrom(rClass)); -} - -///////////////////////////////////////////////////////////////////////////// -// Basic class information - -OClassInfo::OClassInfo(const sal_Char *pClassName, sal_Int32 ObjectSize, - const OClassInfo* pBaseClass, sal_uInt32 Schema, - OObject* (SAL_CALL * fnCreateObject)(const OCreateParam&)) -{ - m_pClassName = pClassName; - m_nObjectSize = ObjectSize; - m_wSchema = Schema; - - m_pfnCreateObject = fnCreateObject; - - m_pBaseClass = pBaseClass; - m_pNextClass = NULL; -} - -OObject* OClassInfo::createObject(const OCreateParam& rParam) const -{ - if (m_pfnCreateObject == NULL) - return NULL; - - OObject* pObject = NULL; - pObject = (*m_pfnCreateObject)(rParam); - - return (pObject); -} - -sal_Bool OClassInfo::isDerivedFrom(const OClassInfo& rClass) const -{ - OSL_ASSERT(this != NULL); - - const OClassInfo* pClassThis = this; - - while (pClassThis != NULL) - { - if (pClassThis == &rClass) - return (sal_True); - - pClassThis = pClassThis->m_pBaseClass; - } - - return (sal_False); // walked to the top, no match -} - -const OClassInfo* OClassInfo::getClassInfo(const sal_Char* pClassName) -{ - OSL_ASSERT(pClassName != NULL); - - const OClassInfo* pClass = &VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos)); - - while (pClass != NULL) - { - if (strcmp(pClassName, pClass->m_pClassName) == 0) - break; - - pClass = pClass->m_pNextClass; - } - - return (pClass); -} - -VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass) -{ - OSL_ASSERT(pNewClass != NULL); - - OClassInfo* pClassRoot = (OClassInfo*)&VOS_CLASSINFO(VOS_NAMESPACE(OObject, vos)); - - pNewClass->m_pNextClass = pClassRoot->m_pNextClass; - - pClassRoot->m_pNextClass = pNewClass; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/process.cxx b/vos/source/process.cxx deleted file mode 100644 index 71cee3525bec..000000000000 --- a/vos/source/process.cxx +++ /dev/null @@ -1,527 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <cstdarg> -#include <vector> -#include <rtl/ustring.hxx> -#include <rtl/instance.hxx> - -#include "vos/process.hxx" -#include "osl/diagnose.h" -#include <osl/file.hxx> - -#define MAX_RESOURCES 100 -#define MAX_ARGS 100 -#define MAX_ENVIROMENTS 100 - -using namespace vos; - -///////////////////////////////////////////////////////////////////////////// -/// Argument - -OArgumentList::OArgumentList() : - n_Args(0), - m_aVec(0) -{ - // empty -} - -OArgumentList::OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument1, ... ) : - n_Args( nArgs ) -{ - m_aVec = new rtl_uString* [nArgs]; - std::va_list pArgs; - sal_uInt32 i = 0; - const rtl::OUString* aArgument; - - va_start ( pArgs, aArgument1 ); - aArgument = aArgument1; - - while( true ) { - m_aVec[i] = aArgument->pData; - rtl_uString_acquire( m_aVec[i++] ); - if( i < n_Args ) - aArgument = va_arg( pArgs,rtl::OUString* ); - else - break; - } - va_end( pArgs ); -} - - -OArgumentList::OArgumentList( const rtl::OUString aArgumentList[], sal_uInt32 nArgs ) : - n_Args( nArgs ) -{ - m_aVec = new rtl_uString* [n_Args]; - for( sal_uInt32 i = 0; i < n_Args; ++ i ) { - m_aVec[i] = aArgumentList[i].pData; - rtl_uString_acquire( m_aVec[i] ); - } -} - -OArgumentList::OArgumentList( const OArgumentList& rOther ) : n_Args( rOther.n_Args ) -{ - m_aVec = new rtl_uString* [n_Args]; - - sal_uInt32 i; - for ( i = 0; i < n_Args; ++i ) - { - m_aVec[i] = rOther.m_aVec[i]; - rtl_uString_acquire( m_aVec[i] ); - } -} - -OArgumentList& OArgumentList::operator=( const OArgumentList& rOther ) -{ - if ( this != &rOther ) - { - - // delete the old one - sal_uInt32 i; - for ( i = 0; i < n_Args; ++i ) - rtl_uString_release( m_aVec[i] ); - - delete [] m_aVec; - - - n_Args = rOther.n_Args; - m_aVec = new rtl_uString* [n_Args]; - for( i = 0; i < n_Args; ++i ) - { - m_aVec[i] = rOther.m_aVec[i]; - rtl_uString_acquire( m_aVec[i] ); - } - } - - return *this; -} - -OArgumentList::~OArgumentList( ) -{ - for( sal_uInt32 i = 0; i < n_Args; ++i ) rtl_uString_release( m_aVec[i] ); - delete[] m_aVec; -} - - -//////////////////////////////////////////////////////////////////////////////// -/// Environment - -OEnvironment::OEnvironment() : - n_Vars( 0 ), - m_aVec( 0 ) -{ -} - -OEnvironment::OEnvironment( sal_Int32 nVars, const ::rtl::OUString* aArgument1, ... ) : - n_Vars( nVars ) -{ - m_aVec = new rtl_uString* [nVars]; - std::va_list pArgs; - sal_Int32 i = 0; - const rtl::OUString* aArgument; - - va_start ( pArgs, aArgument1 ); - aArgument = aArgument1; - - while( true ) { - m_aVec[i] = aArgument->pData; - rtl_uString_acquire( m_aVec[i++] ); - if( i < n_Vars ) - aArgument = va_arg( pArgs,rtl::OUString* ); - else - break; - } - va_end( pArgs ); -} - - -OEnvironment::OEnvironment( const ::rtl::OUString aVariableList[], sal_Int32 nVars ) : - n_Vars( nVars ) -{ - m_aVec = new rtl_uString* [n_Vars]; - for( sal_Int32 i = 0; i < n_Vars; ++ i ) { - m_aVec[i] = aVariableList[i].pData; - rtl_uString_acquire( m_aVec[i] ); - } -} - -OEnvironment::OEnvironment( const OEnvironment& rOther ) : n_Vars( rOther.n_Vars ) -{ - m_aVec = new rtl_uString* [n_Vars]; - - sal_Int32 i; - for ( i = 0; i < n_Vars; ++i ) - { - m_aVec[i] = rOther.m_aVec[i]; - rtl_uString_acquire( m_aVec[i] ); - } -} - -OEnvironment& OEnvironment::operator=( const OEnvironment& rOther ) -{ - if ( this != &rOther ) - { - sal_Int32 i; - for ( i = 0; i < n_Vars; ++i ) - rtl_uString_release( m_aVec[i] ); - - delete [] m_aVec; - - n_Vars = rOther.n_Vars; - m_aVec = new rtl_uString* [n_Vars]; - for ( i = 0; i < n_Vars; ++i ) - { - m_aVec[i] = rOther.m_aVec[i]; - rtl_uString_acquire( m_aVec[i] ); - } - } - - return *this; -} - -OEnvironment::~OEnvironment() -{ - for( sal_Int32 i = 0; i < n_Vars; ++i ) rtl_uString_release( m_aVec[i] ); - delete[] m_aVec; -} - -///////////////////////////////////////////////////////////////////////////// -// Process - - -VOS_IMPLEMENT_CLASSINFO( - VOS_CLASSNAME(OProcess, vos), - VOS_NAMESPACE(OProcess, vos), - VOS_NAMESPACE(OObject, vos), 0); - - -OProcess::OProcess( ) : - m_strImageName( ), - m_strDirectory(), - m_Process(0) -{ -} - - -OProcess::OProcess( const rtl::OUString& strImageName ) : - m_strImageName( strImageName ), - m_strDirectory(), - m_Process(0) -{ - // empty -} - - -OProcess::OProcess(const rtl::OUString& strImageName, const rtl::OUString& strWorkingDirectory) : - m_strImageName( strImageName ), - m_strDirectory( strWorkingDirectory ), - m_Process(0) -{ - // empty -} - - -OProcess::~OProcess() -{ - osl_freeProcessHandle(m_Process); -} - -OProcess* OProcess::getProcess(TProcessIdentifier Identifier) -{ - oslProcess hProcess = osl_getProcess(Identifier); - - if (hProcess) - { - OProcess* pProcess = new OProcess( ); - - pProcess->m_Process = hProcess; - - return pProcess; - } - - return 0; -} - - -OProcess::TProcessError OProcess::execute(TProcessOption Options, - const OArgumentList& aArgumentList, - const OEnvironment& aEnvironment ) -{ - return ((TProcessError)osl_executeProcess(m_strImageName.pData, - aArgumentList.m_aVec, - aArgumentList.n_Args, - Options, - 0, - m_strDirectory.pData, - aEnvironment.m_aVec, - aEnvironment.n_Vars, - &m_Process)); -} - - -OProcess::TProcessError OProcess::execute( TProcessOption Options, - const osl::Security& Security, - const OArgumentList& aArgumentList, - const OEnvironment& aEnvironment ) -{ - return ((TProcessError)osl_executeProcess(m_strImageName.pData, - aArgumentList.m_aVec, - aArgumentList.n_Args, - Options, - Security.getHandle(), - m_strDirectory.pData, - aEnvironment.m_aVec, - aEnvironment.n_Vars, - &m_Process)); -} - - -OProcess::TProcessError OProcess::terminate() -{ - return (TProcessError)osl_terminateProcess(m_Process); -} - -OProcess::TProcessError OProcess::getInfo(TProcessData Data, TProcessInfo* pInfo) const -{ - return (TProcessError)osl_getProcessInfo(m_Process, Data, pInfo); -} - -OProcess::TProcessError OProcess::getCurrentInfo(TProcessData Data, TProcessInfo* pInfo) -{ - return (TProcessError)osl_getProcessInfo(0, Data, pInfo); -} - -OProcess::TProcessError OProcess::join() -{ - return (TProcessError)osl_joinProcess(m_Process); -} - - -/* -OProcess::TProcessError OProcess::searchPath(const sal_Char* Name, sal_Char *Buffer, sal_uInt32 Max, - const sal_Char* Path, sal_Char Separator) -{ - return (TProcessError)osl_searchPath(Name, Path, Separator, Buffer, Max); -} -*/ - -///////////////////////////////////////////////////////////////////////////// -// StartupInfo - -VOS_IMPLEMENT_CLASSINFO( - VOS_CLASSNAME(OStartupInfo, vos), - VOS_NAMESPACE(OStartupInfo, vos), - VOS_NAMESPACE(OObject, vos), 0); - -OStartupInfo::OStartupInfo() -{ -} - -OStartupInfo::~OStartupInfo() -{ -} - -OStartupInfo::TStartupError OStartupInfo::getExecutableFile( - rtl::OUString& strImageName ) const -{ - return (TStartupError) osl_getExecutableFile( &strImageName.pData ); -} - - -OStartupInfo::TStartupError OStartupInfo::getCommandArg(sal_uInt32 nArg, rtl::OUString& strCommandArg) -{ - return ( TStartupError ) osl_getCommandArg( nArg,&strCommandArg.pData ); -} - -sal_uInt32 OStartupInfo::getCommandArgCount() -{ - return osl_getCommandArgCount(); -} - -OStartupInfo::TStartupError OStartupInfo::getEnvironment(const rtl::OUString& strVar, - rtl::OUString& strValue) -{ - return ( TStartupError ) osl_getEnvironment( strVar.pData, &strValue.pData ); -} - - - -///////////////////////////////////////////////////////////////////////////// -// -// OExtCommandLineImpl -// - -namespace vos -{ - -class OExtCommandLineImpl -{ - void init(); - - ::std::vector< ::rtl::OUString > aExtArgVector; - sal_uInt32 m_nArgCount; - -public: - - OExtCommandLineImpl(); - ~OExtCommandLineImpl(); - - sal_uInt32 SAL_CALL getCommandArgCount(); - - sal_Bool SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg); -}; - -} - -OExtCommandLineImpl::OExtCommandLineImpl() - : m_nArgCount(0) -{ - init(); -} - -OExtCommandLineImpl::~OExtCommandLineImpl() -{ - -} - - -sal_uInt32 SAL_CALL OExtCommandLineImpl::getCommandArgCount() -{ - return m_nArgCount; -} - - -sal_Bool SAL_CALL OExtCommandLineImpl::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg) -{ - if ( nArg >= m_nArgCount ) - { - return sal_False; - } - - strCommandArg = aExtArgVector[nArg]; - - return sal_True; -} - - -void OExtCommandLineImpl::init() -{ - OStartupInfo aStartInfo; - sal_uInt32 nIndex=0; - sal_uInt32 nArgs = aStartInfo.getCommandArgCount(); - - for ( nIndex = 0 ; nIndex < nArgs ; ++nIndex ) - { - ::rtl::OUString aString; - aStartInfo.getCommandArg(nIndex,aString); - - if ( aString[0] == (sal_Unicode) '@' ) - { - ::rtl::OUString aFileName = aString.copy(1); - ::osl::File aFile(aFileName); - ::rtl::ByteSequence aSeq; - - ::osl::FileBase::RC aErr = aFile.open(OpenFlag_Read); - - if ( aErr != ::osl::FileBase::E_None ) - { - break; - } - - do - { - aErr = aFile.readLine(aSeq); - if ( aSeq.getLength() != 0 ) - { - ::rtl::OUString newString((sal_Char*)aSeq.getArray(), aSeq.getLength(), RTL_TEXTENCODING_ASCII_US); - aExtArgVector.push_back( newString ); - m_nArgCount++; - } - } - while ( aErr == ::osl::FileBase::E_None && aSeq.getLength() > 0 ); - - aFile.close(); - aFile.remove(aFileName); - } - else - { - aExtArgVector.push_back( aString ); - m_nArgCount++; - } - } -} - - - -///////////////////////////////////////////////////////////////////////////// -// -// OExtCommandLine -// - -namespace -{ - struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; -} - -OExtCommandLineImpl* OExtCommandLine::pExtImpl=0; - - -VOS_IMPLEMENT_CLASSINFO( - VOS_CLASSNAME(OExtCommandLine, vos), - VOS_NAMESPACE(OExtCommandLine, vos), - VOS_NAMESPACE(OObject, vos), 0); - -OExtCommandLine::OExtCommandLine() -{ - ::osl::MutexGuard Guard(lclMutex::get()); - - if ( pExtImpl == NULL ) - { - pExtImpl = new OExtCommandLineImpl; - } -} - -OExtCommandLine::~OExtCommandLine() -{ - - -} - -sal_uInt32 SAL_CALL OExtCommandLine::getCommandArgCount() -{ - return pExtImpl->getCommandArgCount(); -} - - -sal_Bool SAL_CALL OExtCommandLine::getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg) -{ - return pExtImpl->getCommandArg(nArg,strCommandArg); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/refernce.cxx b/vos/source/refernce.cxx deleted file mode 100644 index abd0a7e1994b..000000000000 --- a/vos/source/refernce.cxx +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <limits.h> -#include <osl/diagnose.h> - -#include <vos/refernce.hxx> - -using namespace vos; - -ORefCount::~ORefCount() -{ - -} - - -OReference::OReference() -{ -} - -OReference::~OReference() -{ - OSL_ASSERT(m_RefCount.referenced() == 0); -} - -IReference::RefCount OReference::acquire() -{ - return (m_RefCount.acquire()); -} - -IReference::RefCount OReference::release() -{ - RefCount Count = m_RefCount.release(); - - if (Count == 0) - delete this; - - return (Count); -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/stream.cxx b/vos/source/stream.cxx deleted file mode 100644 index dac976140a9f..000000000000 --- a/vos/source/stream.cxx +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <limits> - -#include <osl/diagnose.h> -#include <vos/object.hxx> -#include <vos/stream.hxx> - -using namespace vos; - -///////////////////////////////////////////////////////////////////////////// -// -// Stream class -// - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OStream, vos), VOS_NAMESPACE(OStream, vos), VOS_NAMESPACE(OObject, vos), 0); - -OStream::OStream(IPositionableStream& rStream) - : m_rStream(rStream) -{ -} - -OStream::~OStream() -{ -} - -sal_Int32 OStream::read(void* pbuffer, sal_uInt32 n) const -{ - return (m_rStream.read(pbuffer, n)); -} - -sal_Int32 OStream::read(IPositionableStream::Offset offset, - void* pbuffer, sal_uInt32 n) const -{ - return (seekTo(offset) ? read(pbuffer, n) : -1); -} - -sal_Int32 OStream::write(const void* pbuffer, sal_uInt32 n) -{ - return - n <= static_cast< sal_uInt32 >(std::numeric_limits< sal_Int32 >::max()) - && (m_rStream.write(pbuffer, n) == static_cast< sal_Int32 >(n)); -} - -sal_Int32 OStream::write(IPositionableStream::Offset offset, - const void* pbuffer, sal_uInt32 n) -{ - return (seekTo(offset) && write(pbuffer, n)); -} - -sal_Bool OStream::append(void* pbuffer, sal_uInt32 n) -{ - return (seekToEnd() && write(pbuffer, n)); -} - -sal_Bool OStream::seekTo(IPositionableStream::Offset pos) const -{ - return (m_rStream.seekTo(pos)); -} - -sal_Bool OStream::seekToEnd() const -{ - return (m_rStream.seekToEnd()); -} - -sal_Bool OStream::seekRelative(sal_Int32 change) const -{ - return (m_rStream.seekRelative(change)); -} - -sal_Bool OStream::changeSize(sal_uInt32 new_size) -{ - return (m_rStream.changeSize(new_size)); -} - -sal_uInt32 OStream::getSize() const -{ - return (m_rStream.getSize()); -} - -sal_Bool OStream::isEof() const -{ - return (m_rStream.isEof()); -} - -IPositionableStream::Offset OStream::getOffset() const -{ - return (m_rStream.getOffset()); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/thread.cxx b/vos/source/thread.cxx deleted file mode 100644 index a8118e5f4e8c..000000000000 --- a/vos/source/thread.cxx +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <osl/time.h> -#include <vos/object.hxx> -#include <vos/thread.hxx> -#include <osl/diagnose.h> - -using namespace vos; - -void vos::threadWorkerFunction_impl(void * pthis) -{ - NAMESPACE_VOS(OThread)* pThis= (NAMESPACE_VOS(OThread)*)pthis; - - // call Handler-Function of OThread-derived class - pThis->run(); - - // if not already terminating, by a kill do normal shutdown - if (! pThis->m_bTerminating) - { - pThis->m_bTerminating = sal_True; - - pThis->onTerminated(); // could e.g. delete this - } -} - -///////////////////////////////////////////////////////////////////////////// -// -// Thread class -// - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThread, vos), - VOS_NAMESPACE(OThread, vos), - VOS_NAMESPACE(OObject, vos), 0); - -OThread::OThread() -{ - m_hThread = 0; - m_bTerminating = sal_False; - m_aCondition = osl_createCondition(); -} - -OThread::~OThread() -{ - if (m_hThread != 0) - { - osl_destroyThread(m_hThread); - } - - osl_destroyCondition( m_aCondition ); -} - -sal_Bool OThread::create() -{ - OSL_ASSERT(m_hThread == 0); // only one running thread per instance - - m_hThread = osl_createSuspendedThread( - threadWorkerFunction_impl, (void*)this); - if (m_hThread) - osl_resumeThread(m_hThread); - - return m_hThread != 0; -} - -sal_Bool OThread::createSuspended() -{ - OSL_ASSERT(m_hThread == 0); // only one running thread per instance - - m_hThread= osl_createSuspendedThread(threadWorkerFunction_impl, (void*)this); - return m_hThread != 0; -} - -void OThread::suspend() -{ - OSL_ASSERT(m_hThread != 0); // use only on running thread - - osl_suspendThread(m_hThread); -} - -void OThread::resume() -{ - OSL_ASSERT(m_hThread != 0); // use only on running thread - - osl_resumeThread(m_hThread); -} - -sal_Bool OThread::isRunning() -{ - return m_hThread != 0 && osl_isThreadRunning(m_hThread); -} - -OThread::TThreadIdentifier OThread::getIdentifier() const -{ - return (TThreadIdentifier)osl_getThreadIdentifier(m_hThread); -} - -OThread::TThreadIdentifier OThread::getCurrentIdentifier() -{ - return (TThreadIdentifier)osl_getThreadIdentifier(0); -} - -void OThread::join() -{ - if (m_hThread) { - OSL_ASSERT(getCurrentIdentifier() != getIdentifier()); - osl_joinWithThread(m_hThread); - } -} - -OThread::TThreadSleep OThread::sleep(const TimeValue& Delay) -{ - TThreadSleep eRet; - - switch( osl_waitCondition( m_aCondition, &Delay ) ) - { - case osl_cond_result_ok: - eRet = TSleep_Normal; - break; - - case osl_cond_result_timeout: - eRet = TSleep_Cancel; - break; - - default: - eRet = TSleep_Error; - break; - } - - return eRet; -} - -void OThread::wait(const TimeValue& Delay) { - osl_waitThread(&Delay); -} - -sal_Bool OThread::awake() -{ - osl_setCondition( m_aCondition ); - return osl_resetCondition( m_aCondition ); -} - -void OThread::terminate() -{ - osl_terminateThread(m_hThread); -} - -sal_Bool OThread::schedule() { - return osl_scheduleThread(m_hThread); -} - -void OThread::kill() -{ - if (osl_isThreadRunning(m_hThread)) - { - // flag we are shutting down - m_bTerminating = sal_True; - - terminate(); - join(); - } -} - -void OThread::setPriority(OThread::TThreadPriority Priority) -{ - osl_setThreadPriority(m_hThread, (oslThreadPriority)Priority); -} - -OThread::TThreadPriority OThread::getPriority() -{ - return (TThreadPriority)osl_getThreadPriority(m_hThread); -} - - -void OThread::yield() -{ - osl_yieldThread(); -} - -void OThread::onTerminated() -{ -} - -///////////////////////////////////////////////////////////////////////////// -// -// ThreadData class -// - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OThreadData, vos), - VOS_NAMESPACE(OThreadData, vos), - VOS_NAMESPACE(OObject, vos), 0); - -OThreadData::OThreadData( oslThreadKeyCallbackFunction pCallback ) -{ - m_hKey = osl_createThreadKey( pCallback ); - OSL_VERIFY(m_hKey); -} - -OThreadData::~OThreadData() -{ - osl_destroyThreadKey(m_hKey); -} - -sal_Bool OThreadData::setData(void *pData) -{ - OSL_ASSERT(m_hKey != 0); - - return (osl_setThreadKeyData(m_hKey, pData)); -} - -void *OThreadData::getData() -{ - OSL_ASSERT(m_hKey != 0); - - return (osl_getThreadKeyData(m_hKey)); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/source/xception.cxx b/vos/source/xception.cxx deleted file mode 100644 index b70085c06517..000000000000 --- a/vos/source/xception.cxx +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <vos/xception.hxx> - -using namespace vos; - -/* - * OException, baseclass of all exceptions - */ - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OException, vos), \ - VOS_NAMESPACE(OException, vos), \ - VOS_NAMESPACE(OObject, vos), 0); - -OException::~OException() -{ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/util/libvos1C50.so.mapfile b/vos/util/libvos1C50.so.mapfile deleted file mode 100644 index 9891ef97b2aa..000000000000 --- a/vos/util/libvos1C50.so.mapfile +++ /dev/null @@ -1,274 +0,0 @@ -{ - global: - __1cDvosFOPipe2G6Mrk1_r1_; - __1cDvosFOPipe2T6M_v_; - __1cDvosFOPipe2t6M_v_; - __1cDvosFOPipe2t6Mpkcn0BLTPipeOption__v_; - __1cDvosFOPipe2t6Mpkcn0BLTPipeOption_rkn0AJOSecurity__v_; - __1cDvosFOPipe2v6kM_pv_; - __1cDvosFOPipeEsend6MpkvL_l_; - __1cDvosFOPipeFclose6M_v_; - __1cDvosFOPipeGaccept6Mrn0ALOStreamPipe__n0BKTPipeError__; - __1cDvosFOPipeGcreate6Mpkcn0BLTPipeOption__C_; - __1cDvosFOPipeGcreate6Mpkcn0BLTPipeOption_rkn0AJOSecurity__C_; - __1cDvosFOPipeHisValid6kM_C_; - __1cDvosGIMutex2T5B6M_v_; - __1cDvosGIMutexG__vtbl_; - __1cDvosGOMutex2T5B6M_v_; - __1cDvosGOMutex2T6M_v_; - __1cDvosGOMutex2t5B6M_v_; - __1cDvosGOMutex2t6M_v_; - __1cDvosGOMutexHacquire6M_v_; - __1cDvosGOMutexHrelease6M_v_; - __1cDvosGOMutexJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosGOMutexMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosGOMutexMtryToAcquire6M_C_; - __1cDvosGOMutexOgetGlobalMutex6F_rn0AGIMutex__; - __1cDvosGOTimer2T5B6M_v_; - __1cDvosGOTimer2t5B6M_v_; - __1cDvosGOTimer2t5B6Mrkn0AKTTimeValue_4_v_; - __1cDvosGOTimer2t5B6Mrkn0AKTTimeValue__v_; - __1cDvosGOTimerEstop6M_v_; - __1cDvosGOTimerFstart6M_v_; - __1cDvosGOTimerJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosGOTimerJisTicking6kM_C_; - __1cDvosGOTimerMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosGOTimerQsetRemainingTime6Mrkn0AKTTimeValue__v_; - __1cDvosHIStream2T5B6M_v_; - __1cDvosHODaemon2T5B6M_v_; - __1cDvosHODaemon2t5B6Mpkcp24Ln0ANIDaemonAccessSTDaemonStartupMode_4_v_; - __1cDvosHODaemonHacquire6M_l_; - __1cDvosHODaemonHexecute6Mlppc_n0AOIDaemonManagerTTDaemonManagerError__; - __1cDvosHODaemonHgetMode6kM_n0ANIDaemonAccessSTDaemonStartupMode__; - __1cDvosHODaemonHrelease6M_l_; - __1cDvosHODaemonJgetStatus6kM_n0ANIDaemonAccessNTDaemonStatus__; - __1cDvosHODaemonJparseArgs6Flppc_n0BSTCommandLineOption__; - __1cDvosHODaemonJsetStatus6Mn0ANIDaemonAccessNTDaemonStatus__v_; - __1cDvosHODaemonKgetVersion6kM_L_; - __1cDvosHODaemonKreferenced6kM_l_; - __1cDvosHODaemonLsetListener6Mrkn0AEORef4n0APIDaemonListener____v_; - __1cDvosHODaemonMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosHODaemonNgetIdentifier6kM_pkc_; - __1cDvosHODaemonNgetManufactor6kM_pkc_; - __1cDvosHODaemonOgetDisplayName6kM_pkc_; - __1cDvosHODaemonPgetDependencies6kM_pkc_; - __1cDvosHODaemonQexecuteAsProcess6MC_n0AOIDaemonManagerTTDaemonManagerError__; - __1cDvosHOModule2T6M_v_; - __1cDvosHOModule2t6Mpkcl_v_; - __1cDvosHOModuleEload6Mpkcl_C_; - __1cDvosHOModuleGunload6M_v_; - __1cDvosHOModuleJgetSymbol6Mpkc_pv_; - __1cDvosHOObject2T5B6M_v_; - __1cDvosHOObject2k6Fpv_v_; - __1cDvosHOObject2n6FI_pv_; - __1cDvosHOObject2n6FIpv_2_; - __1cDvosHOObject2t5B6M_v_; - __1cDvosHOObjectIisKindOf6kMrkn0AKOClassInfo__C_; - __1cDvosHOObjectJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosHOObjectMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosHOSocket2T5B6M_v_; - __1cDvosHOSocket2t5B6Mn0AMISocketTypesLTSocketType_n0CLTAddrFamily_n0CJTProtocol__v_; - __1cDvosHOSocket2t5B6Mpv_v_; - __1cDvosHOSocket2v6kM_pv_; - __1cDvosHOSocketEbind6Mrkn0ALOSocketAddr__C_; - __1cDvosHOSocketFclose6M_v_; - __1cDvosHOSocketHisValid6kM_C_; - __1cDvosHOSocketJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosHOSocketLgetPeerAddr6kMrn0ALOSocketAddr__v_; - __1cDvosHOSocketLgetPeerHost6kMpcl_n0AMISocketTypesHTResult__; - __1cDvosHOSocketLgetPeerPort6kM_l_; - __1cDvosHOSocketMgetLocalAddr6kMrn0ALOSocketAddr__v_; - __1cDvosHOSocketMgetLocalHost6kMpcl_n0AMISocketTypesHTResult__; - __1cDvosHOSocketMgetLocalPort6kM_l_; - __1cDvosHOSocketMsetReuseAddr6kMl_l_; - __1cDvosHOSocketNsetTcpNoDelay6kMl_l_; - __1cDvosHOSocketOsetRecvBufSize6kMl_l_; - __1cDvosHOSocketOsetSendBufSize6kMl_l_; - __1cDvosHOSocketVenableNonBlockingMode6MC_C_; - __1cDvosHOThread2T5B6M_v_; - __1cDvosHOThread2t5B6M_v_; - __1cDvosHOThreadEjoin6M_v_; - __1cDvosHOThreadEkill6M_v_; - __1cDvosHOThreadEwait6FrknJTimeValue__v_; - __1cDvosHOThreadFsleep6MrknJTimeValue__n0BMTThreadSleep__; - __1cDvosHOThreadFyield6F_v_; - __1cDvosHOThreadGcreate6M_C_; - __1cDvosHOThreadGresume6M_v_; - __1cDvosHOThreadHsuspend6M_v_; - __1cDvosHOThreadIschedule6M_C_; - __1cDvosHOThreadJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosHOThreadJisRunning6M_C_; - __1cDvosHOThreadJterminate6M_v_; - __1cDvosHOThreadLsetPriority6Mn0BPTThreadPriority__v_; - __1cDvosHOThreadMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosHOThreadMonTerminated6M_v_; - __1cDvosHOThreadNgetIdentifier6kM_L_; - __1cDvosHOThreadPcreateSuspended6M_C_; - __1cDvosHOThreadUgetCurrentIdentifier6F_L_; - __1cDvosIOChannelNcreateChannel6Frn0AHOObject__n0AEORef4n0B____; - __1cDvosIOProcess2T6M_v_; - __1cDvosIOProcess2t6Mpkcp2E_v_; - __1cDvosIOProcess2t6Mpkcpp2L_v_; - __1cDvosIOProcessEjoin6M_n0BNTProcessError__; - __1cDvosIOProcessHexecute6Mn0BOTProcessOption__n0BNTProcessError__; - __1cDvosIOProcessHexecute6Mn0BOTProcessOption_rkn0AJOSecurity__n0BNTProcessError__; - __1cDvosIOProcessHgetInfo6kMn0BMTProcessData_pn0BMTProcessInfo__n0BNTProcessError__; - __1cDvosIOProcessJterminate6M_n0BNTProcessError__; - __1cDvosIOProcessKgetProcess6FL_p1_; - __1cDvosIOProcessMsetDirectory6Mpkc_v_; - __1cDvosIOProcessOaddEnvironment6Mpkcp2_v_; - __1cDvosIOProcessOgetCurrentInfo6Fn0BMTProcessData_pn0BMTProcessInfo__n0BNTProcessError__; - __1cDvosIOProcessRprovideIOResource6Mpvn0BQTDescriptorFlags__v_; - __1cDvosIOProfile2T5B6M_v_; - __1cDvosIOProfile2T6M_v_; - __1cDvosIOProfile2t5B6M_v_; - __1cDvosIOProfile2t5B6Mpkcn0BOTProfileOption__v_; - __1cDvosIOProfile2t6M_v_; - __1cDvosIOProfile2t6Mpkcn0BOTProfileOption__v_; - __1cDvosIOProfileEopen6Mpkcn0BOTProfileOption__C_; - __1cDvosIOProfileFclose6M_v_; - __1cDvosIOProfileIreadBool6Mpkcp2C_C_; - __1cDvosIOProfileJreadIdent6Mpkcp2Lp4L_L_; - __1cDvosIOProfileJwriteBool6Mpkcp2C_C_; - __1cDvosIOProfileKreadString6Mpkcp2pcL4_C_; - __1cDvosIOProfileKwriteIdent6Mpkcp2Lp4L_C_; - __1cDvosIOProfileLgetSections6MpkcpcL_L_; - __1cDvosIOProfileLremoveEntry6Mpkcp2_C_; - __1cDvosIOProfileLwriteString6Mpkcp24_C_; - __1cDvosIOProfileOgetProfileName6FpcLpkcp3_C_; - __1cDvosIOProfileRgetSectionEntries6MpkcpcL_L_; - __1cDvosJOAcceptor2T5B6M_v_; - __1cDvosJOAcceptor2t5B6Mrn0AVIAcceptHandlerFactory_rn0ALOSocketAddr_n0AMISocketTypesJTProtocol_n0ELTSocketType_C_v_; - __1cDvosJOAcceptor2t6Mrn0AVIAcceptHandlerFactory_rn0ALOSocketAddr_n0AMISocketTypesJTProtocol_n0ELTSocketType_C_v_; - __1cDvosJOAcceptorDrun6M_v_; - __1cDvosJOAcceptorJterminate6M_v_; - __1cDvosJOAcceptorRacceptConnections6Ml_C_; - __1cDvosJORefCount2T6M_v_; - __1cDvosJORefCountG__vtbl_; - __1cDvosJOSecurity2T6M_v_; - __1cDvosJOSecurity2t6M_v_; - __1cDvosJOSecurityJlogonUser6Mpkcp2_C_; - __1cDvosJOSecurityKgetHomeDir6kMpcL_C_; - __1cDvosJOSecurityLgetUserName6kMpcL_C_; - __1cDvosJOSecurityMgetConfigDir6kMpcL_C_; - __1cDvosJOSecurityMgetUserIdent6kMpcL_C_; - __1cDvosJOSecurityPisAdministrator6kM_C_; - __1cDvosKIReference2T5B6M_v_; - __1cDvosKIReferenceG__vtbl_; - __1cDvosKOClassInfo2t6Mpkclpk1LpFrkn0AMOCreateParam__pn0AHOObject__v_; - __1cDvosKOClassInfoNisDerivedFrom6kMrk1_C_; - __1cDvosKOCondition2T6M_v_; - __1cDvosKOCondition2t6M_v_; - __1cDvosKOConditionDset6M_v_; - __1cDvosKOConditionEwait6MpknJTimeValue__n0AKIConditionHTResult__; - __1cDvosKOConditionFcheck6M_C_; - __1cDvosKOConditionFreset6M_v_; - __1cDvosKOReference2T5B6M_v_; - __1cDvosKOReference2t5B6M_v_; - __1cDvosKOReferenceHacquire6M_l_; - __1cDvosKOReferenceHrelease6M_l_; - __1cDvosKOSemaphore2T6M_v_; - __1cDvosKOSemaphore2t6M_v_; - __1cDvosKOSemaphoreG__vtbl_; - __1cDvosKOSemaphoreGcreate6ML_v_; - __1cDvosKOSemaphoreHacquire6M_v_; - __1cDvosKOSemaphoreHrelease6M_v_; - __1cDvosKOSemaphoreMtryToAcquire6M_C_; - __1cDvosLOEventQdDueueNdispatchEvent6Ml_C_; - __1cDvosLOEventQdDueueQregisterListener6Mpn0ATIEventQdDueueListener__C_; - __1cDvosLOEventQdDueueSderegisterListener6Mpn0ATIEventQdDueueListener__C_; - __1cDvosLOSocketAddr2G6Mrk1_r1_; - __1cDvosLOSocketAddr2T6M_v_; - __1cDvosLOSocketAddr2t6M_v_; - __1cDvosLOSocketAddr2t6Mpv_v_; - __1cDvosLOSocketAddr2v6kM_pv_; - __1cDvosLOSocketAddrLgetHostname6kMpcl_n0AMISocketTypesHTResult__; - __1cDvosLOSocketAddrPresolveHostname6Fpkc_pv_; - __1cDvosLOSocketAddrQgetLocalHostname6Fpcl_n0AMISocketTypesHTResult__; - __1cDvosLOStreamPipe2G6Mpv_r1_; - __1cDvosLOStreamPipe2G6Mrkn0AFOPipe__r1_; - __1cDvosLOStreamPipe2T6M_v_; - __1cDvosLOStreamPipe2t6M_v_; - __1cDvosLOStreamPipe2t6Mrk1_v_; - __1cDvosLOStreamPipeEread6kMpvL_l_; - __1cDvosLOStreamPipeFisEof6kM_C_; - __1cDvosLOStreamPipeFwrite6MpkvL_l_; - __1cDvosLOThreadData2T6M_v_; - __1cDvosLOThreadData2t6M_v_; - __1cDvosLOThreadDataHgetData6M_pv_; - __1cDvosLOThreadDataHsetData6Mpv_C_; - __1cDvosMOStartupInfo2T6M_v_; - __1cDvosMOStartupInfo2t6M_v_; - __1cDvosMOStartupInfoOgetCommandArgs6MpcL_n0BNTStartupError__; - __1cDvosMOStartupInfoOgetEnvironment6MpkcpcL_n0BNTStartupError__; - __1cDvosMOStartupInfoQacceptIOResource6Mrn0AHOSocket__C_; - __1cDvosMOStartupInfoRgetExecutableFile6MpcL_n0BNTStartupError__; - __1cDvosNOStreamSocket2G6Mrk1_r1_; - __1cDvosNOStreamSocket2T6M_v_; - __1cDvosNOStreamSocket2t6M_v_; - __1cDvosNOStreamSocket2t6Mrk1_v_; - __1cDvosNOStreamSocketEread6kMpvL_l_; - __1cDvosNOStreamSocketErecv6MpvLn0AMISocketTypesOTSocketMsgFlag__l_; - __1cDvosNOStreamSocketFclose6M_v_; - __1cDvosNOStreamSocketFisEof6kM_C_; - __1cDvosNOStreamSocketFwrite6MpkvL_l_; - __1cDvosNOStreamSocketIshutdown6Mn0AMISocketTypesQTSocketDirection__C_; - __1cDvosNOStreamSocketJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosNVOS_CLASSINIT2t6Mpn0AKOClassInfo__v_; - __1cDvosOIAcceptHandler2T5B6M_v_; - __1cDvosOIDaemonManagerQgetGlobalManager6F_n0AEORef4n0B____; - __1cDvosOOBaseException2T5B6M_v_; - __1cDvosOOBaseExceptionG__vtbl_; - __1cDvosOOBaseExceptionJclassInfo6F_rkn0AKOClassInfo__; - __1cDvosOOBaseExceptionMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosOOChannelBrokerWgetGlobalChannelBroker6F_n0AEORef4n0B____; - __1cDvosOOSignalHandler2T5B6M_v_; - __1cDvosOOSignalHandler2t5B6M_v_; - __1cDvosOOSignalHandlerFraise6Flpv_n0BNTSignalAction__; - __1cDvosOOSignalHandlerMgetClassInfo6kM_rkn0AKOClassInfo__; - __1cDvosPOAcceptorSocket2T6M_v_; - __1cDvosPOAcceptorSocket2t6Mn0AMISocketTypesLTAddrFamily_n0CJTProtocol_n0CLTSocketType__v_; - __1cDvosPOAcceptorSocketFclose6M_v_; - __1cDvosPOAcceptorSocketGlisten6Ml_C_; - __1cDvosPOAcceptorSocketQacceptConnection6Mrn0ANOStreamSocket__n0AMISocketTypesHTResult__; - __1cDvosPODaemonProperty2G6Mrk1_r1_; - __1cDvosPODaemonProperty2T6M_v_; - __1cDvosPODaemonProperty2t6M_v_; - __1cDvosPODaemonProperty2t6MpkcC_v_; - __1cDvosPODaemonProperty2t6MpkcL_v_; - __1cDvosPODaemonProperty2t6MpkcrknDrtlHOString__v_; - __1cDvosPODaemonPropertyHgetName6kM_nDrtlHOString__; - __1cDvosPODaemonPropertyHgetType6kM_n0BTTDaemonPropertyType__; - __1cDvosPODaemonPropertyIgetULong6ML_L_; - __1cDvosPODaemonPropertyJgetString6ML_nDrtlHOString__; - __1cDvosPODaemonPropertyKgetBoolean6ML_C_; - __1cDvosPOInetSocketAddr2G6Mrk1_r1_; - __1cDvosPOInetSocketAddr2T6M_v_; - __1cDvosPOInetSocketAddr2t6M_v_; - __1cDvosPOInetSocketAddr2t6Mpkcl_v_; - __1cDvosPOInetSocketAddr2t6Mpv_v_; - __1cDvosPOInetSocketAddr2t6Mrkn0ALOSocketAddr__v_; - __1cDvosPOInetSocketAddrHgetPort6kM_l_; - __1cDvosPOInetSocketAddrHsetAddr6Mpkc_C_; - __1cDvosPOInetSocketAddrHsetPort6Ml_C_; - __1cDvosPOInetSocketAddrNgetDottedAddr6kMpcl_n0AMISocketTypesHTResult__; - __1cDvosQOConnectorSocket2T6M_v_; - __1cDvosQOConnectorSocket2t6Mn0AMISocketTypesLTAddrFamily_n0CJTProtocol_n0CLTSocketType__v_; - __1cDvosQOConnectorSocketHconnect6Mrkn0ALOSocketAddr_pknJTimeValue__n0AMISocketTypesHTResult__; - __1cDvosSORealDynamicLoaderGgetApi6kM_pv_; - __1cDvosSORealDynamicLoaderHacquire6M_L_; - __1cDvosSORealDynamicLoaderHrelease6M_L_; - __1cDvosSORealDynamicLoaderLnewInstance6Fpp1pkcp4C_2_; - __1cDvosSORealDynamicLoaderLnewInstance6Fpp1pkcp4ClC_2_; - __1cDvosSORealDynamicLoaderQcomputeSolarName6Fpkcpcl_l_; - __1cDvosSORealDynamicLoaderRcomputeModuleName6Fpkcpcl_l_; - __1cDvosSORealDynamicLoaderScomputeLibraryName6Fpkcpcl_l_; - __1cDvosTIEventQdDueueListener2T5B6M_v_; - __1cDvosVIAcceptHandlerFactory2T5B6M_v_; - __1cDvosW__RTTI__1nDvosGOTimer__; - vosEngulfException; - vosMatchException; - vosSalvageException; - local: - *; -};
\ No newline at end of file diff --git a/vos/util/makefile.mk b/vos/util/makefile.mk deleted file mode 100644 index 46c9af4c93db..000000000000 --- a/vos/util/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -RTLLIB=irtl.lib - -PRJ=.. - -PRJNAME=vos -TARGET=vos -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : ..$/version.mk - -# --- Files -------------------------------------------------------- - -SHL1TARGET=$(VOS_TARGET)$(VOS_MAJOR)$(COMID) -SHL1IMPLIB=i$(TARGET) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS=$(WSOCK32LIB) $(SALLIB) -.ELSE -SHL1STDLIBS=$(SALLIB) -.ENDIF - -SHL1LIBS= $(SLB)$/cpp$(TARGET).lib -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= \ - $(SLO)$/object.obj -.ENDIF -.ENDIF - -SHL1DEPN= -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt -DEFLIB1NAME =cppvos - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt: - @echo ------------------------------ - @echo Making: $@ - @echo WEP > $@ - @echo LIBMAIN >> $@ - @echo LibMain >> $@ - @echo _alloc >> $@ - @echo alloc >> $@ - @echo _CT >> $@ - @echo _TI2 >> $@ - @echo _TI1 >> $@ - @echo exception::exception >> $@ - @echo @std@ >> $@ - @echo __>>$@ - diff --git a/vos/version.mk b/vos/version.mk deleted file mode 100644 index f5447ebeedba..000000000000 --- a/vos/version.mk +++ /dev/null @@ -1,40 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# target -VOS_TARGET=vos - -# the major -VOS_MAJOR=3 -# the minor -VOS_MINOR=0 -# the micro -VOS_MICRO=0 - -# this is a c++ compatible library -VOS_CPP=1 - |