diff options
147 files changed, 488 insertions, 578 deletions
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx index 6f07ba95d6ff..6cfd9c11e9fb 100644 --- a/bridges/source/remote/static/proxy.cxx +++ b/bridges/source/remote/static/proxy.cxx @@ -30,12 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> #include <sal/alloca.h> #include <bridges/remote/proxy.hxx> #include <bridges/remote/context.h> @@ -84,7 +78,7 @@ void acquireRemote2UnoProxy( uno_Interface *pThis ) freeRemote2UnoProxy, p->m_sOid.pData, p->m_pType ); - assert( (uno_Interface *)p == pThis ); + OSL_ASSERT( (uno_Interface *)p == pThis ); } } diff --git a/bridges/source/remote/static/remote.cxx b/bridges/source/remote/static/remote.cxx index 1cb26b4ccd9c..ed8b1dbc9d59 100644 --- a/bridges/source/remote/static/remote.cxx +++ b/bridges/source/remote/static/remote.cxx @@ -30,12 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> #include <bridges/remote/remote.hxx> #include <bridges/remote/counter.hxx> @@ -90,7 +84,7 @@ void acquireRemote2RemoteStub( remote_Interface *pThis ) freeRemote2RemoteStub, p->m_sOid.pData, p->m_pType ); - assert( (remote_Interface *)p == pThis ); + OSL_ASSERT( (remote_Interface *)p == pThis ); } } diff --git a/bridges/source/remote/urp/urp_log.hxx b/bridges/source/remote/urp/urp_log.hxx index c7811faf51e9..6c96ea0dbffc 100644 --- a/bridges/source/remote/urp/urp_log.hxx +++ b/bridges/source/remote/urp/urp_log.hxx @@ -29,7 +29,7 @@ ************************************************************************/ namespace bridges_urp { -#ifndef PRODUCT +#ifdef DBG_UTIL #define BRIDGES_URP_PROT #endif diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx index df5ac58d1a2d..ce870bc19ea9 100644 --- a/bridges/test/testclient.cxx +++ b/bridges/test/testclient.cxx @@ -32,11 +32,6 @@ #include "precompiled_bridges.hxx" #include <string.h> -#if OSL_DEBUG_LEVEL == 0 -#undef NDEBUG -#define NDEBUG -#endif -#include <assert.h> #include <osl/time.h> #include <osl/mutex.hxx> @@ -193,10 +188,10 @@ int main( int argc, char *argv[] ) { // test the factory Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); - assert( rBridge2.is() ); - assert( rBridge2->getDescription() == rBridge->getDescription( ) ); - assert( rBridge2->getName() == rBridge->getName() ); - assert( rBridge2 == rBridge ); + OSL_ASSERT( rBridge2.is() ); + OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) ); + OSL_ASSERT( rBridge2->getName() == rBridge->getName() ); + OSL_ASSERT( rBridge2 == rBridge ); } @@ -230,7 +225,7 @@ int main( int argc, char *argv[] ) } Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); -// assert( ! rBridge.is() ); +// OSL_ASSERT( ! rBridge.is() ); } } diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 432a32f2a554..90a07ab31f43 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -30,11 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if OSL_DEBUG_LEVEL == 0 -#undef NDEBUG -#define NDEBUG -#endif -#include <assert.h> #include <string.h> #include <stdlib.h> #include <osl/time.h> @@ -598,7 +593,7 @@ void testException( const Reference < XCallMe > &r ) { try { r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 ); - assert( ! "no exception flown !" ); + OSL_ASSERT( ! "no exception flown !" ); } catch( TestBridgeException & e ) { @@ -606,11 +601,11 @@ void testException( const Reference < XCallMe > &r ) } catch( Exception & e ) { - assert( ! "only base class of exception could be catched!" ); + OSL_ASSERT( ! "only base class of exception could be catched!" ); } catch(...) { - assert(! "wrong unknown exception !" ); + OSL_ASSERT(! "wrong unknown exception !" ); } } diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx index bae00be6caaa..bf5b470d7185 100644 --- a/bridges/test/testoffice.cxx +++ b/bridges/test/testoffice.cxx @@ -30,10 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> #include <osl/time.h> #include <osl/mutex.hxx> @@ -96,7 +92,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr ) rSmgr->createInstance( OUString::createFromAscii( "com.sun.star.io.Pipe" ) ), UNO_QUERY ); - assert( rOut.is() ); + OSL_ASSERT( rOut.is() ); { Sequence < sal_Int8 > seq( 10 ); @@ -115,7 +111,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr ) if( ! ( 42 == seq.getArray()[0] ) ) printf( "wrong element in sequence\n" ); -// assert( 0 ); +// OSL_ASSERT( 0 ); } } #include<stdio.h> @@ -155,7 +151,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr ) rSmgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ))), UNO_QUERY ); - assert( rLoader.is() ); + OSL_ASSERT( rLoader.is() ); sal_Char *urls[] = { "private:factory/swriter", diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx index cf67d2484cb3..1cfc44078376 100644 --- a/bridges/test/testsameprocess.cxx +++ b/bridges/test/testsameprocess.cxx @@ -30,11 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if OSL_DEBUG_LEVEL == 0 -#undef NDEBUG -#define NDEBUG -#endif -#include <assert.h> #include <osl/time.h> #include <osl/mutex.hxx> @@ -201,7 +196,7 @@ int main( int argc, char *argv[] ) Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) ); - assert( ! rBridge.is() ); + OSL_ASSERT( ! rBridge.is() ); } catch( Exception & ) diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst index 007a01aec93f..268240c4597b 100644 --- a/cli_ure/prj/build.lst +++ b/cli_ure/prj/build.lst @@ -1,4 +1,4 @@ -ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi tools NULL +ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges NULL ure cli_ure usr1 - all ure_mkout NULL ure cli_ure\inc nmake - all ure_inc NULL ure cli_ure\version nmake - all ure_source_version ure_inc NULL diff --git a/cli_ure/qa/climaker/makefile.mk b/cli_ure/qa/climaker/makefile.mk index cde3f4066142..a5b0af914f29 100644 --- a/cli_ure/qa/climaker/makefile.mk +++ b/cli_ure/qa/climaker/makefile.mk @@ -41,7 +41,7 @@ CLIMAKER*=$(WRAPCMD) $(BIN)$/climaker #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = ClimakerTestCase.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx index 075a3cdb75bd..9ef17010b0d2 100644 --- a/cli_ure/source/native/path.cxx +++ b/cli_ure/source/native/path.cxx @@ -38,7 +38,7 @@ #include <windows.h> #include "sal/types.h" -#include "tools/pathutils.hxx" +//#include "tools/pathutils.hxx" namespace cli_ure { diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk index bab3dcbb30ea..1bc926dc0fe0 100644 --- a/codemaker/test/cppumaker/makefile.mk +++ b/codemaker/test/cppumaker/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx index 2f5c75fc1d92..9cd3dc70d3fd 100644 --- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx +++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx @@ -369,7 +369,7 @@ #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Type.hxx" #include "com/sun/star/uno/TypeClass.hpp" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk index 4051dd6d82ec..8b720c832cf4 100644 --- a/cppu/qa/makefile.mk +++ b/cppu/qa/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -43,28 +43,28 @@ INCPRE += $(MISC)$/$(TARGET)$/inc SHL1TARGET = $(TARGET)_any SHL1OBJS = $(SLO)$/test_any.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) SHL2TARGET = $(TARGET)_unotype SHL2OBJS = $(SLO)$/test_unotype.obj -SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL2VERSIONMAP = version.map SHL2IMPLIB = i$(SHL2TARGET) DEF2NAME = $(SHL2TARGET) SHL3TARGET = $(TARGET)_reference SHL3OBJS = $(SLO)$/test_reference.obj -SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL3VERSIONMAP = version.map SHL3IMPLIB = i$(SHL3TARGET) DEF3NAME = $(SHL3TARGET) SHL4TARGET = $(TARGET)_recursion SHL4OBJS = $(SLO)$/test_recursion.obj -SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL4VERSIONMAP = version.map SHL4IMPLIB = i$(SHL4TARGET) DEF4NAME = $(SHL4TARGET) @@ -92,7 +92,7 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN) - testshl2 $(SHL1TARGETN) - testshl2 $(SHL2TARGETN) - testshl2 $(SHL3TARGETN) - testshl2 $(SHL4TARGETN)
\ No newline at end of file + $(TESTSHL2) $(SHL1TARGETN) + $(TESTSHL2) $(SHL2TARGETN) + $(TESTSHL2) $(SHL3TARGETN) + $(TESTSHL2) $(SHL4TARGETN) diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index cad91661926f..785af529e51a 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -58,7 +58,7 @@ #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/uno/Type.hxx" #include "com/sun/star/uno/XInterface.hpp" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/diagnose.h" #include "osl/interlck.h" #include "rtl/string.h" diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index 6ae70c44d003..60853776662b 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -31,7 +31,7 @@ #include "precompiled_cppu.hxx" #include "sal/config.h" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "sal/types.h" #include "Rec.hpp" diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index afb12654a124..8bb793c655e4 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -35,7 +35,7 @@ #include "Interface1.hpp" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 0068dcedd463..ad457d516fa2 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -47,7 +47,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppu/unotype.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index ddbc3f7c6f82..cfcfebf246e6 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "com/sun/star/lang/XEventListener.hpp" #include "cppuhelper/interfacecontainer.hxx" diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk index dd6c13fea52c..624bc797a64b 100644 --- a/cppuhelper/qa/ifcontainer/makefile.mk +++ b/cppuhelper/qa/ifcontainer/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/cppu_ifcontainer.obj SHL1TARGET= cppu_ifcontainer @@ -49,6 +49,7 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(SALLIB) \ $(CPPULIB) \ + $(TESTSHL2LIB)\ $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index b081274d8e99..2ad56c05ff1c 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ INCPRE += -I$(MISC)$/$(TARGET)$/inc SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_propertysetmixin.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 5336b60ae68a..ecb7220d110d 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -64,7 +64,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/mutex.hxx" #include "osl/thread.h" #include "rtl/ref.hxx" diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index 21af4b8d1364..f80388d5d122 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "cppuhelper/unourl.hxx" #include "rtl/malformeduriexception.hxx" diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk index a611b135c7e9..a999532c5b4a 100644 --- a/cppuhelper/qa/unourl/makefile.mk +++ b/cppuhelper/qa/unourl/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/cppu_unourl.obj SHL1TARGET= cppu_unourl @@ -49,6 +49,7 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(SALLIB) \ $(CPPULIB) \ + $(TESTSHL2LIB)\ $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk index 95f1697ef7be..bb0072b4d0f3 100644 --- a/cppuhelper/qa/weak/makefile.mk +++ b/cppuhelper/qa/weak/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_weak.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) @@ -53,4 +53,4 @@ SLOFILES = $(SHL1OBJS) ALLTAR: test test .PHONY: $(SHL1TARGETN) - testshl2 $(SHL1TARGETN) + $(TESTSHL2) $(SHL1TARGETN) diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index 98bbb6527276..0cf128d519d6 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.cxx @@ -41,7 +41,7 @@ #include "com/sun/star/uno/XWeak.hpp" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/weak.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ref.hxx" #include "sal/types.h" diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index 88f25e192e49..cc5b7708f1d8 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -40,13 +40,6 @@ #include <hash_map> -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - #include <com/sun/star/lang/XEventListener.hpp> diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx index 8784f59d79e3..89b2d6411e77 100644 --- a/cppuhelper/test/testidlclass.cxx +++ b/cppuhelper/test/testidlclass.cxx @@ -30,11 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" -#if OSL_DEBUG_LEVEL == 0 -#undef NDEBUG -#define NDEBUG -#endif -#include <assert.h> #include <cppuhelper/stdidlclass.hxx> @@ -65,18 +60,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) (XServiceInfo * ) 0 ); - assert( r.is() ); + OSL_ASSERT( r.is() ); { // test the xidlclassprovider interface ! Reference< XIdlClassProvider > rProv( r , UNO_QUERY ); - assert( rProv.is() ); + OSL_ASSERT( rProv.is() ); { Sequence < Reference < XIdlClass > > seq = rProv->getIdlClasses(); // is always one - assert( seq.getLength() == 1 ); + OSL_ASSERT( seq.getLength() == 1 ); // test the weak reference rProv->getIdlClasses(); @@ -89,7 +84,7 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) } - assert( r->getName() == sImplName ); + OSL_ASSERT( r->getName() == sImplName ); // test equals Reference < XIdlClass > r2 = @@ -101,18 +96,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) (XServiceInfo * ) 0 ); // test for implementation name - assert( r2->equals( r ) ); + OSL_ASSERT( r2->equals( r ) ); Sequence < Reference < XIdlClass > > seqIdlClass = r->getInterfaces(); //TODO ! // one idl class for one interface // this test fails, if core reflection fails ! -// assert( 1 == seqIdlClass.getLength() ); +// OSL_ASSERT( 1 == seqIdlClass.getLength() ); // Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0]; // check for IdlClass interface returned by Core Reflection -// assert( rIdlInterface.is() ); +// OSL_ASSERT( rIdlInterface.is() ); diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx index e798f86cab54..d3b17ed3e83a 100644 --- a/cppuhelper/test/testproptyphlp.cxx +++ b/cppuhelper/test/testproptyphlp.cxx @@ -34,12 +34,6 @@ #include <com/sun/star/beans/Property.hpp> -#if OSL_DEBUG_LEVEL == 0 -#undef NDEBUG -#define NDEBUG -#endif -#include <assert.h> - using namespace ::com::sun::star::uno; using namespace ::cppu; @@ -51,27 +45,27 @@ void testPropertyTypeHelper() sal_Int32 i; convertPropertyValue( i , a ); - assert( 25 == i ); + OSL_ASSERT( 25 == i ); sal_Int16 i16; convertPropertyValue( i16 , a ); - assert( 25 == i16 ); + OSL_ASSERT( 25 == i16 ); sal_Int8 i8; convertPropertyValue( i8 , a ); - assert( 25 == i8 ); + OSL_ASSERT( 25 == i8 ); sal_uInt32 i32; convertPropertyValue( i32 , a ); - assert( 25 == i32 ); + OSL_ASSERT( 25 == i32 ); double d; convertPropertyValue( d , a ); - assert( 25. == d ); + OSL_ASSERT( 25. == d ); float f; convertPropertyValue( f , a ); - assert( 25. == f ); + OSL_ASSERT( 25. == f ); ::com::sun::star::beans::Property prop; @@ -83,11 +77,11 @@ void testPropertyTypeHelper() ::com::sun::star::beans::Property prop2; convertPropertyValue( prop2 , a ); - assert( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes ); + OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes ); ::rtl::OUString ow; a <<= prop.Name; convertPropertyValue( ow , a ); - assert( ow == prop.Name ); + OSL_ASSERT( ow == prop.Name ); } diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 69ccf08fce6a..29d326170ff1 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -49,12 +49,6 @@ #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> #include <string.h> @@ -632,7 +626,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 sal_Int32 nToRead = nBytesToRead - ( m_pBuffer->getSize() - m_nCurrentPos ); nRead = m_input->readBytes( aData , nToRead ); - assert( aData.getLength() == nRead ); + OSL_ASSERT( aData.getLength() == nRead ); try { @@ -650,7 +644,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 } } - assert( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); + OSL_ASSERT( m_pBuffer->getSize() - m_nCurrentPos >= nBytesToRead ); m_pBuffer->readAt( m_nCurrentPos , aData , nBytesToRead ); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 3de10d5fe63e..b7515b3c5417 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -55,10 +55,6 @@ #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> #include <string.h> using namespace ::rtl; @@ -209,13 +205,13 @@ sal_Int32 ODataStreamTest::test( rSource = Reference< XActiveDataSource > ( x, UNO_QUERY ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( rPipeInput ); rSource->setOutputStream( rPipeOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 == hTestHandle ) { testSimple( rInput , rOutput ); @@ -778,10 +774,10 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, Reference <XOutputStream > markableOutput( x , UNO_QUERY ); Reference <XActiveDataSource > markableSource( x , UNO_QUERY ); - assert( markableInput.is() ); - assert( markableOutput.is() ); - assert( markableSink.is() ); - assert( markableSource.is() ); + OSL_ASSERT( markableInput.is() ); + OSL_ASSERT( markableOutput.is() ); + OSL_ASSERT( markableSink.is() ); + OSL_ASSERT( markableSource.is() ); markableSink->setInputStream( rPipeInput ); markableSource->setOutputStream( rPipeOutput ); @@ -799,14 +795,14 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, rSource = Reference <XActiveDataSource>( x, UNO_QUERY ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( markableInput ); rSource->setOutputStream( markableOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) { testObject( rOutput , rInput); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index 88d52a09c891..20e4015ffa1f 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -46,12 +46,6 @@ #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> -#include <string.h> - using namespace ::rtl; using namespace ::osl; using namespace ::cppu; @@ -159,8 +153,8 @@ sal_Int32 OMarkableOutputStreamTest::test( Reference< XOutputStream > rOutput( TestObject , UNO_QUERY ); - assert( rPipeInput.is() ); - assert( rOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rOutput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rOutput , rPipeInput ); @@ -526,8 +520,8 @@ sal_Int32 OMarkableInputStreamTest::test( Reference < XInputStream > rInput( TestObject , UNO_QUERY ); - assert( rPipeOutput.is() ); - assert( rInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); + OSL_ASSERT( rInput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rPipeOutput , rInput ); diff --git a/offapi/com/sun/star/frame/XSessionManagerListener2.idl b/offapi/com/sun/star/frame/XSessionManagerListener2.idl new file mode 100644 index 000000000000..51e8643e459a --- /dev/null +++ b/offapi/com/sun/star/frame/XSessionManagerListener2.idl @@ -0,0 +1,56 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: XSessionManagerListener.idl,v $ + * $Revision: 1.4 $ + * + * 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 __com_sun_star_frame_XSessionManagerListener2_idl__ +#define __com_sun_star_frame_XSessionManagerListener2_idl__ + +#ifndef __com_sun_star_lang_XEventListener_idl__ +#include <com/sun/star/lang/XEventListener.idl> +#endif + +#ifndef __com_sun_star_frame_XSessionManagerListener_idl__ +#include <com/sun/star/frame/XSessionManagerListener.idl> +#endif +//============================================================================= + +module com { module sun { module star { module frame { + + interface XSessionManagerListener2 : XSessionManagerListener + { + /** doQuit gets called when the session manager has decided + the application should quit. Under these circumstances bringing up + further UI will usually be impossible and must be avoided. + */ + [oneway] void doQuit(); + }; + +}; }; }; }; + + +#endif diff --git a/offapi/com/sun/star/frame/makefile.mk b/offapi/com/sun/star/frame/makefile.mk index 789a0f6e499e..0d0650a701fb 100644 --- a/offapi/com/sun/star/frame/makefile.mk +++ b/offapi/com/sun/star/frame/makefile.mk @@ -142,6 +142,7 @@ IDLFILES=\ XRecordableDispatch.idl\ XSessionManagerClient.idl\ XSessionManagerListener.idl\ + XSessionManagerListener2.idl\ XStatusListener.idl\ XStatusbarController.idl\ XStorable.idl\ diff --git a/offapi/com/sun/star/util/Duration.idl b/offapi/com/sun/star/util/Duration.idl new file mode 100644 index 000000000000..39f3ca8114ce --- /dev/null +++ b/offapi/com/sun/star/util/Duration.idl @@ -0,0 +1,104 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: DateTime.idl,v $ + * $Revision: 1.7 $ + * + * 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 __com_sun_star_util_Duration_idl__ +#define __com_sun_star_util_Duration_idl__ + + +//======================================================================== + +module com { module sun { module star { module util { + +//======================================================================== + +/** represents a duration. + + <p> + A duration is the difference of 2 <type>DateTime</type>s. + </p> + + <p> + Note that there are no constraints on the ranges of the members, + except that every member must be non-negative: + for example, a Duration of 400 Days is valid. + </p> + + @since OOo 3.3 + */ +struct Duration +{ + //-------------------------------------------------------------------- + /** explicit sign bit. + */ + boolean Negative; + + //-------------------------------------------------------------------- + /** contains the years. + */ + unsigned short Years; + + //-------------------------------------------------------------------- + /** contains the months. + */ + unsigned short Months; + + //-------------------------------------------------------------------- + /** contains the days. + */ + unsigned short Days; + + //-------------------------------------------------------------------- + /** contains the hours. + */ + unsigned short Hours; + + //-------------------------------------------------------------------- + /** contains the minutes. + */ + unsigned short Minutes; + + //-------------------------------------------------------------------- + /** contains the seconds. + */ + unsigned short Seconds; + + //-------------------------------------------------------------------- + /** contains the hundredth seconds. + */ + unsigned short HundredthSeconds; + +}; + +//======================================================================== + +}; }; }; }; + +#endif + diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk index 44fbdf9065b2..e5f9aab136c3 100644 --- a/offapi/com/sun/star/util/makefile.mk +++ b/offapi/com/sun/star/util/makefile.mk @@ -53,6 +53,7 @@ IDLFILES=\ DateTime.idl\ DateTimeRange.idl\ DiskFullException.idl\ + Duration.idl\ ElementChange.idl \ Endianness.idl \ FileIOException.idl\ diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index 281c8e27cbf0..b41fbbb5ada9 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -365,7 +365,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal return REG_SET_VALUE_FAILED; } - rValue.flush(); + //rValue.flush(); rtl_freeMemory(pBuffer); return REG_NO_ERROR; } @@ -424,7 +424,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL return REG_SET_VALUE_FAILED; } - rValue.flush(); + //rValue.flush(); rtl_freeMemory(pBuffer); return REG_NO_ERROR; } @@ -492,7 +492,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu return REG_SET_VALUE_FAILED; } - rValue.flush(); + //rValue.flush(); rtl_freeMemory(pBuffer); return REG_NO_ERROR; } @@ -560,7 +560,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p return REG_SET_VALUE_FAILED; } - rValue.flush(); + //rValue.flush(); rtl_freeMemory(pBuffer); return REG_NO_ERROR; } diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 8a4dd8b88ee9..b9edca734232 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -848,7 +848,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName) { return REG_DELETE_KEY_FAILED; } - sFile.flush(); + //sFile.flush(); // set flag deleted !!! ((ORegKey*)hOldKey)->setDeleted(sal_True); @@ -894,7 +894,7 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey) { return REG_DELETE_VALUE_FAILED; } - ((OStoreFile&)pKey->getStoreFile()).flush(); + //((OStoreFile&)pKey->getStoreFile()).flush(); } _err = rStoreDir.next(iter); @@ -1065,7 +1065,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, { return REG_VALUE_NOT_EXISTS; } - pSourceKey->getStoreFile().flush(); + //pSourceKey->getStoreFile().flush(); pBuffer = (sal_uInt8*)rtl_allocateMemory(VALUE_HEADERSIZE); @@ -1137,7 +1137,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, rtl_freeMemory(pBuffer); return REG_INVALID_VALUE; } - rTargetFile.flush(); + //rTargetFile.flush(); if (rwBytes != nSize) { @@ -1482,6 +1482,20 @@ RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const return REG_NO_ERROR; } +RegError ORegistry::flush() +{ + REG_GUARD(m_mutex); + + if (m_file.isValid()) + { + m_file.flush(); + return REG_NO_ERROR; + } else + { + return REG_REGISTRY_NOT_EXISTS; + } +} + //********************************************************************* // dumpValue() diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index c32dcf3527df..32baf9cc6ed5 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -113,6 +113,8 @@ public: RegError dumpRegistry(RegKeyHandle hKey) const; + RegError flush(); + ~ORegistry(); sal_Bool isReadOnly() const diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index cb145b3910c2..139646f7cdc7 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -430,6 +430,8 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, */ _ret = pKey->closeKey(pNewKey); + if (_ret == REG_NO_ERROR ) + _ret = pReg->flush(); return _ret; } diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 8e7d76cda614..e02485cdf4ce 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -466,6 +466,7 @@ oslFileError FileHandle_Impl::readFileAt ( oslFileError result = syncFile(); if (result != osl_File_E_None) return (result); + m_bufptr = -1, m_buflen = 0; if (nBytesRequested >= m_bufsiz) { @@ -535,6 +536,7 @@ oslFileError FileHandle_Impl::writeFileAt ( oslFileError result = syncFile(); if (result != osl_File_E_None) return (result); + m_bufptr = -1, m_buflen = 0; if (nBytesToWrite >= m_bufsiz) { @@ -1009,7 +1011,7 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) FileHandle_Impl::Guard lock (&(pImpl->m_mutex)); - OSL_FILE_TRACE("osl_syncFile(%d)", pImpl->m_fd); + OSL_TRACE("osl_syncFile(%d)", pImpl->m_fd); oslFileError result = pImpl->syncFile(); if (result != osl_File_E_None) return (result); diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 11928a3b6458..ac47b1ac6050 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -255,7 +255,7 @@ void do_cleanup( void ) */ -#ifdef PRODUCT +#ifndef DBG_UTIL __try #endif { @@ -267,7 +267,7 @@ void do_cleanup( void ) rtl_cache_fini(); rtl_arena_fini(); } -#ifdef PRODUCT +#ifndef DBG_UTIL __except( EXCEPTION_EXECUTE_HANDLER ) { } diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 34deba2293da..60c51cfb3a73 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -400,6 +400,7 @@ oslFileError FileHandle_Impl::readFileAt ( oslFileError result = syncFile(); if (result != osl_File_E_None) return (result); + m_bufptr = -1, m_buflen = 0; if (nBytesRequested >= m_bufsiz) { @@ -472,6 +473,7 @@ oslFileError FileHandle_Impl::writeFileAt ( oslFileError result = syncFile(); if (result != osl_File_E_None) return (result); + m_bufptr = -1, m_buflen = 0; if (nBytesToWrite >= m_bufsiz) { diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx index 16283a48da92..f1105298deaf 100644 --- a/sal/qa/ByteSequence/ByteSequence.cxx +++ b/sal/qa/ByteSequence/ByteSequence.cxx @@ -36,7 +36,7 @@ #include <rtl/byteseq.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> using namespace rtl; diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk index a2ecbd5ccef1..0f1b88ac6e6a 100644 --- a/sal/qa/ByteSequence/makefile.mk +++ b/sal/qa/ByteSequence/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,10 @@ CXXFLAGS+= $(LFS_CFLAGS) #----------------------------------- OStringBuffer ----------------------------------- SHL1OBJS= \ - $(SLO)$/ByteSequence.obj + $(SLO)$/ByteSequence.obj SHL1TARGET= rtl_ByteSequence -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -70,9 +63,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/rtl_old_testbyteseq.obj SHL2TARGET= rtl_old_testbyteseq -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) diff --git a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx index 1c49a316c537..2cea6fa3a878 100644 --- a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx +++ b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx @@ -42,7 +42,7 @@ using namespace ::rtl; -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace rtl_testbyteseq diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk index be0f891cf8fc..d20c011a552e 100644 --- a/sal/qa/OStringBuffer/makefile.mk +++ b/sal/qa/OStringBuffer/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -56,16 +56,7 @@ SHL1OBJS= \ $(SLO)$/rtl_String_Utils.obj SHL1TARGET= rtl_OStringBuffer -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) - -# .IF "$(GUI)" == "WNT" -# SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -# .ENDIF -# .IF "$(GUI)" == "UNX" -# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index df97eccf751e..2b3bbfd6caa3 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -38,7 +38,7 @@ #include <rtl/strbuf.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> using namespace rtl; diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index fd58c9e633a3..586908e93032 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Condition by codegen.pl +# auto generated Target:Condition by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Condition.obj SHL1TARGET= osl_Condition -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index c04261176ee6..608bd38e3a64 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -59,7 +59,7 @@ #include <unistd.h> #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value ) diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index 7c6d1232c1a0..0d83a06b7124 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) SHL1OBJS= \ $(SLO)$/osl_File.obj SHL1TARGET= osl_File -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) -# .IF "$(GUI)" == "WNT" -# SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -# .ENDIF -# .IF "$(GUI)" == "UNX" -# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) @@ -66,13 +58,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj SHL2TARGET=tcwf -SHL2STDLIBS=$(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL2STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB=i$(SHL2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def SHL2VERSIONMAP = $(PRJ)$/qa$/export.map @@ -85,9 +71,7 @@ DEF2NAME =$(SHL2TARGET) SHL3OBJS= \ $(SLO)$/osl_old_test_file.obj SHL3TARGET= osl_old_test_file -SHL3STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL3IMPLIB= i$(SHL3TARGET) diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 3a44c565d162..a1cb3fa54e9e 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -44,7 +44,7 @@ #include <osl/file.hxx> #include <osl_File_Const.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // #ifdef WNT // # define UNICODE diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 18be1d38e40c..64258b8e9006 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -51,7 +51,7 @@ #define TEST_VOLUME "c:/" #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace osl_test_file { diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 6c4986f485b3..05910ea3ddd7 100755 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index d3500d267020..40f597bdbbc7 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ CXXFLAGS+= $(LFS_CFLAGS) # --- test dll ------------------------------------------------------ SHL1TARGET = Module_DLL SHL1OBJS = $(SLO)$/osl_Module_DLL.obj -SHL1STDLIBS = $(SALLIB) +SHL1STDLIBS = $(SALLIB) SHL1IMPLIB = i$(SHL1TARGET) SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) @@ -59,21 +59,16 @@ SHL1VERSIONMAP = export_dll.map SHL2OBJS= $(SLO)$/osl_Module.obj SHL2TARGET= osl_Module -SHL2STDLIBS= $(SALLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" -SHL2STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib SHL2STDLIBS+=i$(SHL2TARGET).lib .ENDIF -.IF "$(GUI)" == "OS2" -SHL2STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF .IF "$(GUI)" == "UNX" -SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a APP3STDLIBS+=-l$(SHL2TARGET) .ENDIF -SHL2DEPN= $(SHL1OBJS) +SHL2DEPN= $(SHL1OBJS) SHL2IMPLIB= i$(SHL2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index beeb4a800a11..ad954b5cb4ad 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -37,7 +37,7 @@ #include <osl/module.hxx> #include <osl/file.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #if ( defined UNX ) || ( defined OS2 ) //Unix # include <unistd.h> diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index ed7874eb11b5..46610f35f22c 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -33,7 +33,7 @@ #include <stdio.h> #include <sal/types.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes ) { diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk index 44c5b6b46f7f..7c8cfeb39037 100755 --- a/sal/qa/osl/mutex/makefile.mk +++ b/sal/qa/osl/mutex/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,22 +44,16 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Mutex.obj SHL1TARGET= osl_Mutex -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL1STDLIBS += $(WS2_32LIB) .ENDIF -.IF "$(GUI)" == "OS2" -SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib -.ENDIF - .IF "$(GUI)" == "UNX" SHL1STDLIBS += -ldl -lnsl .ENDIF diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h index 789b9e91c007..a13f40ab9605 100755 --- a/sal/qa/osl/mutex/osl_Mutex_Const.h +++ b/sal/qa/osl/mutex/osl_Mutex_Const.h @@ -49,7 +49,7 @@ #endif #include <osl/time.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #ifdef UNX #include <unistd.h> diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk index 636bdde7de82..3d0df14bbd69 100644 --- a/sal/qa/osl/pipe/makefile.mk +++ b/sal/qa/osl/pipe/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,21 +44,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Pipe by codegen.pl +# auto generated Target:Pipe by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Pipe.obj SHL1TARGET= osl_Pipe -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) - -#.IF "$(GUI)" == "WNT" -#SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -#.ENDIF -#.IF "$(GUI)" == "UNX" -#SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -#.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 4f0da4ea686e..c2b2ae740527 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -35,7 +35,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index 17f6ab46bd5a..32e97f3c162d 100644 --- a/sal/qa/osl/process/makefile.mk +++ b/sal/qa/osl/process/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl +# auto generated Target:testjob by codegen.pl .IF "$(GUI)" == "WNT" CFLAGS+=/Ob1 @@ -55,17 +55,7 @@ SHL1OBJS= \ $(SLO)$/osl_Thread.obj SHL1TARGET= osl_Thread -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .IF "$(OS)" == "SOLARIS" -# SHL1STDLIBS += -lrt -laio -# .ENDIF -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) @@ -82,14 +72,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS=$(SLO)$/osl_process.obj SHL2TARGET=osl_process -SHL2STDLIBS=$(SALLIB) - -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL2STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB=i$(SHL2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def @@ -98,7 +81,7 @@ DEF2EXPORTFILE=export.exp # END ------------------------------------------------------------------ -OBJ3FILES=$(OBJ)$/osl_process_child.obj +OBJ3FILES=$(OBJ)$/osl_process_child.obj APP3TARGET=osl_process_child APP3OBJS=$(OBJ3FILES) diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 9f666acc9659..88f796b6728c 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -52,7 +52,7 @@ #endif #include <osl/time.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> using namespace osl; using namespace rtl; diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 7fb794925ed2..a0fe5182daa1 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <osl/process.h> #include <osl/file.hxx> #include <osl/thread.h> diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk index d685655feb86..482bc69276a2 100644 --- a/sal/qa/osl/profile/makefile.mk +++ b/sal/qa/osl/profile/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,7 @@ SHL1OBJS= \ $(SLO)$/osl_old_testprofile.obj SHL1TARGET= osl_old_testprofile -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) @@ -61,7 +59,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies SLOFILES=\ - $(SHL1OBJS) + $(SHL1OBJS) # --- Targets ------------------------------------------------------ diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index d5a6b3d92468..27e4cbe6b35b 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -40,7 +40,7 @@ #include <stdio.h> #include <osl/profile.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //================================================================================================== // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk index 5896f1b6108d..6bcc6fc9f6d3 100755 --- a/sal/qa/osl/security/makefile.mk +++ b/sal/qa/osl/security/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,23 +44,15 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Security by codegen.pl +# auto generated Target:Security by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Security.obj SHL1TARGET= osl_Security -SHL1STDLIBS=\ - $(SALLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS+= $(ADVAPI32LIB) .ENDIF -.IF "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 428d6bb30fc6..ca08e3025b38 100755 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -57,7 +57,7 @@ #include <pwd.h> #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // LLA: #include <testshl2/cmdlinebits.hxx> diff --git a/sal/qa/osl/semaphore/makefile.mk b/sal/qa/osl/semaphore/makefile.mk index d5ad5e532626..a8918dcfb12b 100644 --- a/sal/qa/osl/semaphore/makefile.mk +++ b/sal/qa/osl/semaphore/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Semaphore by codegen.pl +# auto generated Target:Semaphore by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Semaphore.obj SHL1TARGET= osl_Semaphore -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) diff --git a/sal/qa/osl/semaphore/osl_Semaphore_Const.h b/sal/qa/osl/semaphore/osl_Semaphore_Const.h index f1aafa3a6244..c9f1149674f4 100644 --- a/sal/qa/osl/semaphore/osl_Semaphore_Const.h +++ b/sal/qa/osl/semaphore/osl_Semaphore_Const.h @@ -51,7 +51,7 @@ #endif #include <osl/time.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #ifdef UNX #include <unistd.h> diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk index 5bcb252d187a..134bcadb55aa 100755 --- a/sal/qa/osl/socket/makefile.mk +++ b/sal/qa/osl/socket/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,22 +44,18 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL1OBJS= \ $(SLO)$/osl_Socket.obj SHL1TARGET=osl_SocketOld -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" -#SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib SHL1STDLIBS+= $(WS2_32LIB) .ENDIF .IF "$(GUI)" == "UNX" -#SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a SHL1STDLIBS+= -ldl -lnsl .ENDIF @@ -75,9 +71,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/osl_Socket_tests.obj SHL2TARGET= osl_Socket_tests -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME= $(SHL2TARGET) @@ -86,15 +80,13 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map # END -------------------------------------------------------------- # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL3OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_StreamSocket.obj SHL3TARGET= osl_StreamSocket -SHL3STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL3STDLIBS += $(WS2_32LIB) @@ -111,15 +103,13 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL4OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_DatagramSocket.obj SHL4TARGET= osl_DatagramSocket -SHL4STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL4STDLIBS += $(WS2_32LIB) @@ -136,15 +126,13 @@ SHL4VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL5OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_SocketAddr.obj SHL5TARGET= osl_SocketAddr -SHL5STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL5STDLIBS += $(WS2_32LIB) @@ -161,15 +149,13 @@ SHL5VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL6OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_Socket2.obj SHL6TARGET= osl_Socket2 -SHL6STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL6STDLIBS += $(WS2_32LIB) @@ -186,15 +172,13 @@ SHL6VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL7OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_ConnectorSocket.obj SHL7TARGET= osl_ConnectorSocket -SHL7STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL7STDLIBS += $(WS2_32LIB) @@ -211,15 +195,13 @@ SHL7VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:Socket by codegen.pl +# auto generated Target:Socket by codegen.pl SHL8OBJS= \ $(SLO)$/sockethelper.obj \ $(SLO)$/osl_AcceptorSocket.obj SHL8TARGET= osl_AcceptorSocket -SHL8STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) .IF "$(GUI)" == "WNT" SHL8STDLIBS += $(WS2_32LIB) diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 002e27efbd0e..6325385b62ee 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index e3f4ad3e5bea..52c1b12b687e 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 4e714d0b655b..4cf27a90ad90 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //#include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 20f2a80d04da..ccc87ee23a1d 100755 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -66,7 +66,7 @@ #include <osl_Socket_Const_orig.h> #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> using namespace osl; using namespace rtl; diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 29a7924c5503..a7b0ecfa1ef7 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //#include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index e9db614bade8..63ca58f67936 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //#include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 3122b27b1f1a..7f0fb5bbe87e 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------------ #include <osl_Socket_Const.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <osl/socket.hxx> //------------------------------------------------------------------------ // helper functions diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 0d5a1e54739f..9769d13adb0f 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -61,7 +61,7 @@ // include files //------------------------------------------------------------------------ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //#include "osl_Socket_Const.h" #include "sockethelper.hxx" diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index c10ebcb2c8ca..681858f15dc1 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -32,7 +32,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" #include "sockethelper.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //------------------------------------------------------------------------ // Ip version definition diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk index e74400ba6aff..86551fc6771b 100644 --- a/sal/qa/osl/thread/makefile.mk +++ b/sal/qa/osl/thread/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_thread.obj -SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx index 59c857c82b2f..21fd2e297fe0 100644 --- a/sal/qa/osl/thread/test_thread.cxx +++ b/sal/qa/osl/thread/test_thread.cxx @@ -33,7 +33,7 @@ #include "sal/config.h" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/conditn.hxx" #include "osl/thread.hxx" #include "osl/time.h" diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk index 4fad638942fb..ce88442a5574 100755 --- a/sal/qa/rtl/alloc/makefile.mk +++ b/sal/qa/rtl/alloc/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,20 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:jobfile by codegen.pl +# auto generated Target:jobfile by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_alloc.obj SHL1TARGET= rtl_Alloc -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) -# .IF "$(GUI)" == "WNT" -# SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -# .ENDIF -# .IF "$(GUI)" == "UNX" -# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 75173f3aaf86..ae9a1e9e9587 100755 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -34,7 +34,7 @@ // autogenerated file with codegen.pl #include <rtl/alloc.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace rtl_alloc { diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk index ff47fa6c78d2..a492af8dd3c5 100644 --- a/sal/qa/rtl/bootstrap/makefile.mk +++ b/sal/qa/rtl/bootstrap/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -55,14 +55,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_Bootstrap.obj SHL1TARGET= rtl_Bootstrap -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -72,7 +70,7 @@ DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ -OBJ2FILES=$(OBJ)$/bootstrap_process.obj +OBJ2FILES=$(OBJ)$/bootstrap_process.obj APP2TARGET=bootstrap_process APP2OBJS=$(OBJ2FILES) diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index 85efcfa55b34..520c1298030f 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -39,9 +39,9 @@ #include <stdlib.h> #include <algorithm> // STL -#include "cppunit/stringhelper.hxx" +#include "testshl/stringhelper.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> //#include "stringhelper.hxx" //#include "valueequal.hxx" #include <rtl/bootstrap.hxx> diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk index c8d508f8b9ef..fc7a975651f5 100644 --- a/sal/qa/rtl/cipher/makefile.mk +++ b/sal/qa/rtl/cipher/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_cipher.obj SHL1TARGET= rtl_cipher -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index c51344cdc83e..a55f4a20d6fe 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -32,7 +32,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/strbuf.hxx> #include <rtl/cipher.h> diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk index aa24d698ea30..8b1ee4a6f350 100755 --- a/sal/qa/rtl/crc32/makefile.mk +++ b/sal/qa/rtl/crc32/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,19 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:jobfile by codegen.pl +# auto generated Target:jobfile by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_crc32.obj SHL1TARGET= rtl_crc32 -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index fa5870c9c8dd..09f492376ba2 100755 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -33,7 +33,7 @@ #include "precompiled_sal.hxx" // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/crc.h> namespace rtl_CRC32 diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk index a80835047d8b..7786522901ee 100644 --- a/sal/qa/rtl/digest/makefile.mk +++ b/sal/qa/rtl/digest/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,10 @@ CXXFLAGS+= $(LFS_CFLAGS) #----------------------------------- OStringBuffer ----------------------------------- SHL1OBJS= \ - $(SLO)$/rtl_digest.obj + $(SLO)$/rtl_digest.obj SHL1TARGET= rtl_digest -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME= $(SHL1TARGET) diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 151b01f8994c..9f8dd3f24542 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/digest.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk index 7ee93688eff2..b46518fb2e68 100644 --- a/sal/qa/rtl/doublelock/makefile.mk +++ b/sal/qa/rtl/doublelock/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl +# auto generated Target:testjob by codegen.pl .IF "$(GUI)" == "WNT" CFLAGS+=/Ob1 @@ -55,9 +55,7 @@ SHL1OBJS= \ $(SLO)$/rtl_doublelocking.obj SHL1TARGET= rtl_doublelocking -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 2f3f004dbabc..cbcc334d3134 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -46,7 +46,7 @@ #include <rtl/instance.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // ----------------------------------------------------------------------------- #define CONST_TEST_STRING "gregorian" diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk index 6ad4991bcfd9..8e4710c5ac6b 100644 --- a/sal/qa/rtl/locale/makefile.mk +++ b/sal/qa/rtl/locale/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:locale by codegen.pl +# auto generated Target:locale by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_locale.obj SHL1TARGET= rtl_locale -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 91fb285db98a..c677259038f3 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -33,7 +33,7 @@ #include "precompiled_sal.hxx" // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/locale.hxx> #include <osl/thread.h> diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk index 23a5979237d9..da70d7533fa0 100644 --- a/sal/qa/rtl/logfile/makefile.mk +++ b/sal/qa/rtl/logfile/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) SHL1OBJS= \ $(SLO)$/rtl_logfile.obj SHL1TARGET= rtl_logfile -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 9ed83adf9c09..d589cfb2bf04 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -46,7 +46,7 @@ #endif #include <rtl/logfile.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // #ifndef _OSL_MODULE_HXX_ // #include <osl/module.hxx> diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk index 14e8cec2ec9c..5db3ffdd2028 100644 --- a/sal/qa/rtl/math/makefile.mk +++ b/sal/qa/rtl/math/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,10 @@ CXXFLAGS+= $(LFS_CFLAGS) #----------------------------------- OStringBuffer ----------------------------------- SHL1OBJS= \ - $(SLO)$/test_rtl_math.obj + $(SLO)$/test_rtl_math.obj SHL1TARGET= rtl_math -SHL1STDLIBS=\ - $(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -71,9 +64,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/rtl_math.obj SHL2TARGET= rtl_math2 -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME= $(SHL2TARGET) @@ -90,14 +81,12 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map # SHL3OBJS= \ # $(SLO)$/rtl_old_testint64.obj # SHL3TARGET= rtl_old_testint64 -# SHL3STDLIBS=\ -# $(SALLIB) \ -# $(CPPUNITLIB) -# +# SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +# # SHL3IMPLIB= i$(SHL3TARGET) # DEF3NAME= $(SHL3TARGET) # SHL3VERSIONMAP = $(PRJ)$/qa$/export.map -# +# #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx index 34d851b4f2e7..a9c16541e524 100644 --- a/sal/qa/rtl/math/rtl_math.cxx +++ b/sal/qa/rtl/math/rtl_math.cxx @@ -37,7 +37,7 @@ #endif #include <math.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/math.h> #include <rtl/string.hxx> diff --git a/sal/qa/rtl/math/rtl_old_testint64.cxx b/sal/qa/rtl/math/rtl_old_testint64.cxx index e0059b200db6..923c464186f3 100644 --- a/sal/qa/rtl/math/rtl_old_testint64.cxx +++ b/sal/qa/rtl/math/rtl_old_testint64.cxx @@ -49,7 +49,7 @@ // #define TEST_ENSURE(c, m) OSL_VERIFY(c) // #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // ----------------------------------------------------------------------------- namespace rtl_math diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk index 279697313cf1..d2c6049afcbc 100644 --- a/sal/qa/rtl/ostring/makefile.mk +++ b/sal/qa/rtl/ostring/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_OString2.obj SHL1TARGET= rtl_OString2 -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -68,9 +66,7 @@ SHL2OBJS= \ $(SLO)$/rtl_str.obj SHL2TARGET= rtl_str -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) @@ -82,9 +78,7 @@ SHL3OBJS= \ $(SLO)$/rtl_string.obj SHL3TARGET= rtl_string -SHL3STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL3IMPLIB= i$(SHL3TARGET) DEF3NAME =$(SHL3TARGET) diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index 8421346f84a7..2ff2ca6b434b 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -34,7 +34,7 @@ // autogenerated file with codegen.pl // There exist some more test code in sal/qa/rtl_strings/rtl_OString.cxx -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "valueequal.hxx" namespace rtl_OString diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 5e34b034bffb..6ce43ae0bb9b 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace rtl_str { diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index 549555d0e10a..a1fc88037f51 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace rtl_string { diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk index dedaa650107d..40e4ba4a0b58 100644 --- a/sal/qa/rtl/oustring/makefile.mk +++ b/sal/qa/rtl/oustring/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_OUString2.obj SHL1TARGET= rtl_OUString2 -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -68,9 +66,7 @@ SHL2OBJS= \ $(SLO)$/rtl_ustr.obj SHL2TARGET= rtl_ustr -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 9606ae0859c3..8632a159ab85 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -38,7 +38,7 @@ #include <algorithm> // STL -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "stringhelper.hxx" #include "valueequal.hxx" diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index 5cc28ea1f389..43610d0461f4 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> /** print a UNI_CODE file name. */ diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk index 9737d998a768..a910d7222773 100644 --- a/sal/qa/rtl/oustringbuffer/makefile.mk +++ b/sal/qa/rtl/oustringbuffer/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_OUStringBuffer2.obj SHL1TARGET= rtl_OUStringBuffer2 -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx index d259e63174f8..febaa2a9d552 100644 --- a/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx +++ b/sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "stringhelper.hxx" #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk index c1f5d9cad7eb..ac8d66e24b7d 100644 --- a/sal/qa/rtl/process/makefile.mk +++ b/sal/qa/rtl/process/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_Process.obj SHL1TARGET= rtl_Process -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -62,7 +60,7 @@ DEF1NAME =$(SHL1TARGET) SHL1VERSIONMAP= $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ -OBJ3FILES=$(OBJ)$/child_process.obj +OBJ3FILES=$(OBJ)$/child_process.obj APP3TARGET=child_process APP3OBJS=$(OBJ3FILES) @@ -74,7 +72,7 @@ APP3OBJS=$(OBJ3FILES) #.ENDIF APP3STDLIBS=$(SALLIB) -OBJ4FILES=$(OBJ)$/child_process_id.obj +OBJ4FILES=$(OBJ)$/child_process_id.obj APP4TARGET=child_process_id APP4OBJS=$(OBJ4FILES) diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 78360186fea7..e14d52905c32 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -36,7 +36,7 @@ #include <string.h> #include <sal/types.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <rtl/process.h> diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk index 61cd9b676351..0fc2e5e5a7f8 100644 --- a/sal/qa/rtl/random/makefile.mk +++ b/sal/qa/rtl/random/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:job by codegen.pl +# auto generated Target:job by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_random.obj SHL1TARGET= rtl_Random -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index 7e3c56115b33..ae3845bd16b9 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -35,7 +35,7 @@ #include <algorithm> // STL -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/random.h> namespace rtl_random diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk index 16abc6b7e118..8b2a62b82d13 100644 --- a/sal/qa/rtl/strings/makefile.mk +++ b/sal/qa/rtl/strings/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ SHL1OBJS := \ $(SLO)$/test_oustring_endswith.obj \ $(SLO)$/test_oustring_noadditional.obj SHL1IMPLIB := i$(SHL1TARGET) -SHL1STDLIBS := $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1VERSIONMAP := $(PRJ)$/qa$/export.map DEF1NAME := $(SHL1TARGET) diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx index a19c3360145c..582dd6a21b7a 100644 --- a/sal/qa/rtl/strings/test_oustring_compare.cxx +++ b/sal/qa/rtl/strings/test_oustring_compare.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/string.h" #include "rtl/ustring.hxx" diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx index b579da99ee27..e1219c3024d6 100644 --- a/sal/qa/rtl/strings/test_oustring_convert.cxx +++ b/sal/qa/rtl/strings/test_oustring_convert.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/strbuf.hxx" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx index 83714ff6fe71..467878697fd2 100644 --- a/sal/qa/rtl/strings/test_oustring_endswith.cxx +++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/strbuf.hxx" #include "rtl/string.h" #include "rtl/string.hxx" diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx index 26db4917f096..dd30871b7622 100644 --- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx +++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx @@ -31,6 +31,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" NOADDITIONAL; diff --git a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx index ca05cbf514b7..71fb6def0b31 100644 --- a/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx +++ b/sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk index c2b9a836ab3b..31f700b7b96a 100644 --- a/sal/qa/rtl/textenc/makefile.mk +++ b/sal/qa/rtl/textenc/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) SHL1OBJS= \ $(SLO)$/rtl_textcvt.obj SHL1TARGET= rtl_textcvt -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) @@ -65,9 +63,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/rtl_tencinfo.obj SHL2TARGET= rtl_tencinfo -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index 8f5fa28defda..2bc3f930af42 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -36,7 +36,7 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 0e4a1a306949..2129815a6779 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -36,7 +36,7 @@ #include <cstddef> #include <cstring> -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/string.hxx" #include "rtl/tencinfo.h" #include "rtl/textcvt.h" diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk index 95ba01debd1e..2c536da484d7 100644 --- a/sal/qa/rtl/uri/makefile.mk +++ b/sal/qa/rtl/uri/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) SHL1OBJS= \ $(SLO)$/rtl_Uri.obj SHL1TARGET= rtl_uri_simple -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) @@ -61,9 +59,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/rtl_testuri.obj SHL2TARGET= rtl_Uri -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index 794074e18d0f..cc27f956b573 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -38,7 +38,7 @@ #include <osl/thread.h> #include <osl/file.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // ----------------------------------------------------------------------------- diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 956c5ccbaacb..4d1d80830dd3 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -39,7 +39,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include <cstddef> #include <stdio.h> diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk index ed780dd82ec1..554c2034d0cd 100644 --- a/sal/qa/rtl/uuid/makefile.mk +++ b/sal/qa/rtl/uuid/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,12 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_Uuid.obj SHL1TARGET= rtl_Uuid -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 508a1127b60e..a77c4e8d90de 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -34,7 +34,7 @@ #include <math.h> #include <stdio.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/uuid.h> #include <rtl/ustring.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk index 4cd99ba3aec9..166ef568debc 100644 --- a/sal/qa/rtl_strings/makefile.mk +++ b/sal/qa/rtl_strings/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -44,15 +44,13 @@ CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) # BEGIN ---------------------------------------------------------------- -# auto generated Target:FileBase by codegen.pl +# auto generated Target:FileBase by codegen.pl SHL1OBJS= \ $(SLO)$/rtl_String_Utils.obj \ $(SLO)$/rtl_OString.obj SHL1TARGET= rtl_OString -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -65,15 +63,13 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:FileBase by codegen.pl +# auto generated Target:FileBase by codegen.pl SHL2OBJS= \ $(SLO)$/rtl_String_Utils.obj \ $(SLO)$/rtl_OUString.obj SHL2TARGET= rtl_OUString -SHL2STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB= i$(SHL2TARGET) # SHL2DEF= $(MISC)$/$(SHL2TARGET).def @@ -86,22 +82,13 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- -# auto generated Target:FileBase by codegen.pl +# auto generated Target:FileBase by codegen.pl SHL3OBJS= \ $(SLO)$/rtl_String_Utils.obj \ $(SLO)$/rtl_OUStringBuffer.obj SHL3TARGET= rtl_OUStringBuffer -SHL3STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) - -# .IF "$(GUI)" == "WNT" -# SHL3STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -# .ENDIF -# .IF "$(GUI)" == "UNX" -# SHL3STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .ENDIF +SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL3IMPLIB= i$(SHL3TARGET) # SHL3DEF= $(MISC)$/$(SHL3TARGET).def @@ -115,12 +102,10 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map # BEGIN ---------------------------------------------------------------- SHL4OBJS= \ - $(SLO)$/rtl_old_teststrbuf.obj + $(SLO)$/rtl_old_teststrbuf.obj SHL4TARGET= rtl_old_teststrbuf -SHL4STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL4IMPLIB= i$(SHL4TARGET) DEF4NAME =$(SHL4TARGET) @@ -130,12 +115,10 @@ SHL4VERSIONMAP = $(PRJ)$/qa$/export.map # BEGIN ---------------------------------------------------------------- SHL5OBJS= \ - $(SLO)$/rtl_old_testowstring.obj + $(SLO)$/rtl_old_testowstring.obj SHL5TARGET= rtl_old_testowstring -SHL5STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL5IMPLIB= i$(SHL5TARGET) DEF5NAME =$(SHL5TARGET) @@ -145,12 +128,10 @@ SHL5VERSIONMAP = $(PRJ)$/qa$/export.map # BEGIN ---------------------------------------------------------------- SHL6OBJS= \ - $(SLO)$/rtl_old_testostring.obj + $(SLO)$/rtl_old_testostring.obj SHL6TARGET= rtl_old_testostring -SHL6STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL6IMPLIB= i$(SHL6TARGET) DEF6NAME =$(SHL6TARGET) diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx index 6c481914127d..329eb71c7dc5 100644 --- a/sal/qa/rtl_strings/rtl_old_testostring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx @@ -48,7 +48,7 @@ #include <rtl/string.hxx> #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c)) diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx index 6741deb06e84..938ec01f5fff 100644 --- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx @@ -61,7 +61,7 @@ #include <rtl/locale.hxx> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c)) // #if OSL_DEBUG_LEVEL > 0 diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx index 7f6a54478697..c277517d57b2 100644 --- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx +++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx @@ -53,7 +53,7 @@ #include <rtl/ustrbuf.hxx> #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> using namespace rtl; diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk index ebf7aa314ab7..61f279e226eb 100644 --- a/sal/qa/sal/makefile.mk +++ b/sal/qa/sal/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS := TRUE SHL1TARGET = $(TARGET)_types SHL1OBJS = $(SLO)$/test_types.obj -SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx index fff05cb08106..5d72175bb8db 100644 --- a/sal/qa/sal/test_types.cxx +++ b/sal/qa/sal/test_types.cxx @@ -35,7 +35,7 @@ #include <stdio.h> // C99 snprintf not necessarily in <cstdio> #include <string.h> // wntmsci10 does not know <cstring> std::strcmp -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "sal/types.h" namespace { diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk index cde5b71c215c..035bef25c34a 100644 --- a/sal/qa/systools/makefile.mk +++ b/sal/qa/systools/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,12 @@ CXXFLAGS+= $(LFS_CFLAGS) CFLAGS+=/Ob0 # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/test_comtools.obj SHL1TARGET= test_comtools -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB)\ - uuid.lib +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) uuid.lib SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx index 1957d62d54f2..c61ff435d235 100644 --- a/sal/qa/systools/test_comtools.cxx +++ b/sal/qa/systools/test_comtools.cxx @@ -33,7 +33,7 @@ #include "precompiled_sal.hxx" // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <systools/win32/comtools.hxx> class COMObject : public IUnknown diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk index 0064cabef952..33c43f259081 100644 --- a/sal/qa/testHelperFunctions/makefile.mk +++ b/sal/qa/testHelperFunctions/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,7 @@ SHL1OBJS= \ $(SLO)$/testHelperFunctions2.obj SHL1TARGET= testHelperFunctions -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx index 9272433d2e1f..9d96d91939ec 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx @@ -38,7 +38,7 @@ #include "stringhelper.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // void isJaBloed() // { diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx index 9ddc1031d7fa..1adae36ade2a 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "stringhelper.hxx" namespace testOfHelperFunctions diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk index 9987b3a276cd..4589338a5316 100644 --- a/salhelper/qa/makefile.mk +++ b/salhelper/qa/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS := TRUE SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_api.obj -SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) +SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB) SHL1IMPLIB = i$(SHL1TARGET) SHL1VERSIONMAP = version.map DEF1NAME = $(SHL1TARGET) @@ -51,4 +51,4 @@ SLOFILES = $(SHL1OBJS) ALLTAR: test test .PHONY: $(SHL1TARGETN) - cd $(SHL1TARGETN:d) && testshl2 $(SHL1TARGETN:f) + cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f) diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx index 9957f6a56cf1..83df7ec084c6 100644 --- a/salhelper/qa/test_api.cxx +++ b/salhelper/qa/test_api.cxx @@ -59,7 +59,7 @@ std::type_info const & getSimpleReferenceObjectTypeInfo() } -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/mutex.hxx" #include "salhelper/condition.hxx" #include "salhelper/dynload.hxx" diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java index 07467cc54c0f..55916cff784b 100644 --- a/stoc/test/javavm/testapplet/TestApplet.java +++ b/stoc/test/javavm/testapplet/TestApplet.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.net.URL; import java.io.InputStream; import java.net.MalformedURLException; -import com.sun.star.lib.sandbox.*; /* * TestApplet.java * diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk index 706180655f06..da5a21e4f166 100644 --- a/stoc/test/javavm/testapplet/makefile.mk +++ b/stoc/test/javavm/testapplet/makefile.mk @@ -40,7 +40,7 @@ TARGET = TestApplet #.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk # Files -------------------------------------------------------- -JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar +JARFILES = ridl.jar jurt.jar unoil.jar JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java index a0fb1d01a858..5622ba087d7a 100644 --- a/stoc/test/javavm/testcomponent/TestComponent.java +++ b/stoc/test/javavm/testcomponent/TestComponent.java @@ -4,7 +4,7 @@ import com.sun.star.uno.*; import com.sun.star.registry.XRegistryKey; import java.io.*; import java.net.*; -import com.sun.star.lib.sandbox.*; +//import com.sun.star.lib.sandbox.*; /** This component implements XTypeProvider for use with StarBasic. @@ -74,10 +74,11 @@ public class TestComponent implements XServiceInfo, XTypeProvider }catch( IOException e) { String s= e.getMessage(); System.out.println(s); - }catch( SandboxSecurityException sse) { + }/*catch( SandboxSecurityException sse) { String s= sse.getMessage(); System.out.println("s"); } +*/ return __serviceName; } diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk index 68f3f5bd6431..9fcd390b02a1 100644 --- a/stoc/test/javavm/testcomponent/makefile.mk +++ b/stoc/test/javavm/testcomponent/makefile.mk @@ -40,7 +40,7 @@ TARGET = JavaTestComponent #.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk # Files -------------------------------------------------------- -JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar +JARFILES = ridl.jar jurt.jar unoil.jar CUSTOMMANIFESTFILE= manifest diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk index 85e3a294f434..78b54bb2a5a2 100644 --- a/stoc/test/uriproc/makefile.mk +++ b/stoc/test/uriproc/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ UNOTYPES = \ SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_uriproc.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index f1032276eb89..71f92e504d64 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -47,7 +47,7 @@ #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp" #include "com/sun/star/util/XMacroExpander.hpp" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/diagnose.h" #include "osl/thread.h" #include "rtl/string.h" diff --git a/xml2cmp/source/xcd/xmlelem.cxx b/xml2cmp/source/xcd/xmlelem.cxx index 4b642e1d30cc..aa80459ccead 100644 --- a/xml2cmp/source/xcd/xmlelem.cxx +++ b/xml2cmp/source/xcd/xmlelem.cxx @@ -36,15 +36,6 @@ #include <parse.hxx> #include <cr_html.hxx> -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - - - XmlElement::XmlElement( const char * i_sName ) : sName(i_sName) { @@ -160,7 +151,6 @@ ListElement::Write2Html( HtmlCreator & io_rHC ) const XmlElement * ListElement::Create_and_Add_NewElement() { - assert(fCreateNewElement != 0); XmlElement * pNew = (*fCreateNewElement)(Name()); Children().push_back( pNew ); return pNew; |