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 | 8deaa02aa7d033a9c30179d89c9d14d03817e666 (patch) | |
| tree | d712d41ead32454defc1aa631628cec4fbf326ac /sfx2/qa | |
| parent | 9622451cd779b35aeffa378418cd1d55b688368b (diff) | |
| parent | 9587364f011f889d6d65a175d57275e915f65672 (diff) | |
sb123: merged in DEV300_m87
Diffstat (limited to 'sfx2/qa')
| -rw-r--r-- | sfx2/qa/cppunit/makefile.mk | 7 | ||||
| -rw-r--r-- | sfx2/qa/cppunit/test_metadatable.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 2794c2ae92..dce0b86a06 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +#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 + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 903be69203..6a0be13a9c 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -27,10 +27,12 @@ #include "precompiled_sfx2.hxx" +#include "preextstl.h" #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include <rtl/ustrbuf.hxx> |