From d996328cd5f46eeed2df0cbd510eda28e2f7cef9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Sep 2011 21:24:31 +0200 Subject: sb140: #i113503# mixing system CppUnit and OOo STLport does not work, backed out a6913c9677c2 For LibO, that just means replacing sal/cppunit.h with sal/precppunit.hxx. --- smoketestoo_native/smoketest.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'smoketestoo_native') diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 447d12eac092..b77ed701c0ea 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include "boost/noncopyable.hpp" #include "com/sun/star/awt/AsyncCallback.hpp" @@ -49,11 +50,14 @@ #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/util/URL.hpp" #include "cppuhelper/implbase1.hxx" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "osl/conditn.hxx" #include "osl/diagnose.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "sal/cppunit.h" #include "test/gettestargument.hxx" #include "test/officeconnection.hxx" #include "test/oustringostreaminserter.hxx" -- cgit