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 | 48637b9bcfd300d7d0f9ee2956b1f0a7c8e07668 (patch) | |
| tree | f0e0ec3a4f9032330df468a567c5c5f6f72d2932 /test | |
| parent | d5a7d1139d5995c1e6c051aab5e985125fa66c98 (diff) | |
| parent | 04873f78c8cd0594d1beaabe50f8cb38135eb665 (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 1c2d5a8ca2ff..52f8f7ab9db5 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 4baa18081379..d460d9c73b8b 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" |