diff options
| author | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
| commit | 96550e0a997e864fa2368c1ba8caca7d2b5a29e6 (patch) | |
| tree | 5470838cb55d09ae8256a49b41c53381c3c995c9 /test | |
| parent | a8fa4e515ab889a46c13c81444332f8399052d7f (diff) | |
| parent | b30b550611dc4ec6a6fbad5299ac9a54639f4030 (diff) | |
sb123: 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 1c2d5a8ca..52f8f7ab9 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)/gettestargument.obj \ diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx index 4baa18081..d460d9c73 100644 --- a/test/source/cpp/officeconnection.cxx +++ b/test/source/cpp/officeconnection.cxx @@ -33,7 +33,9 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" #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" |