diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
| commit | ac27218d0d423c99fed81f7726ef0bb10d67c14e (patch) | |
| tree | a8046e11a6fad9af2487ec0c4c26969be1316f25 /sal/qa/OStringBuffer | |
| parent | 98ff20e30873c73ca8ba3995fd0c959a1b28fc78 (diff) | |
| parent | 6e8628fb7374b7d19e15f03e63f8ad221ca25f1e (diff) | |
rebase to DEV300_m69
Diffstat (limited to 'sal/qa/OStringBuffer')
| -rw-r--r-- | sal/qa/OStringBuffer/makefile.mk | 13 | ||||
| -rw-r--r-- | sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 2 |
2 files changed, 3 insertions, 12 deletions
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; |