diff options
| author | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
| commit | bef9c1232e178c0caf7daabd5714f867c74e0042 (patch) | |
| tree | 3980d0580f2ecf720f8f50d57ece3d63e1151e46 /test | |
| parent | 6b1681c73d4242a7657ad731103f11ce76b7a35e (diff) | |
| parent | 04873f78c8cd0594d1beaabe50f8cb38135eb665 (diff) | |
sb126: merged in DEV300_m87
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/cpp/makefile.mk | 7 | ||||
| -rw-r--r-- | test/source/cpp/officeconnection.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index bb570cd2cc97..9561be25fc1f 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -35,6 +35,13 @@ VISIBILITY_HIDDEN = TRUE CDEFS += -DOOO_DLLIMPLEMENTATION_TEST CFLAGSCXX += $(CPPUNIT_CFLAGS) +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + SLOFILES = \ $(SLO)/getargument.obj \ $(SLO)/officeconnection.obj \ diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx index abf1d88fedb9..85c1b855f88b 100644 --- a/test/source/cpp/officeconnection.cxx +++ b/test/source/cpp/officeconnection.cxx @@ -33,7 +33,9 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/uno/Reference.hxx" #include "cppuhelper/bootstrap.hxx" +#include <preextstl.h> #include "cppunit/TestAssert.h" +#include <postextstl.h> #include "osl/process.h" #include "osl/time.h" #include "sal/types.h" |