diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
| commit | 8d7922aa5299d1bd75a78066e19e96b46b6b380a (patch) | |
| tree | 9b11c03dd3cc0f06902c29793228e4e8fa7b424e /codemaker | |
| parent | 0ed88426b5a379c0c5dbeffd70bc0c63e7c3641f (diff) | |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/test/cppumaker/makefile.mk | 4 | ||||
| -rw-r--r-- | codemaker/test/cppumaker/test_codemaker_cppumaker.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk index bab3dcbb3..1bc926dc0 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 f22c1dcce..9cd3dc70d 100644 --- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx +++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx @@ -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 @@ -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" @@ -453,13 +453,13 @@ void Test::testBigStruct() { #endif sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct)); #endif - + com::sun::star::uno::Type t( cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get()); typelib_TypeDescription * td = NULL; t.getDescription(&td); typelib_typedescription_complete(&td); - fprintf(stdout, "#### 1\n"); + fprintf(stdout, "#### 1\n"); CPPUNIT_ASSERT(td != NULL); CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_STRUCT, td->eTypeClass); typelib_StructTypeDescription * std = |