diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
| commit | 034375b2eea085506ef606b07ceeccd1c5f4e3b8 (patch) | |
| tree | 1a16f74ab80bb86798933010da8f1f36bd43eaba /test | |
| parent | 2729833407da1a9982229fc68c3f6edcb43f6555 (diff) | |
| parent | 5964db25f25c85ea70607310198fc50df9e7f088 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes77
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 8494bd4aaa05..04eedea3c670 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 ccfd2cd0a069..b77fb59e4fff 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" |