diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 21:24:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 22:47:50 +0200 |
| commit | d996328cd5f46eeed2df0cbd510eda28e2f7cef9 (patch) | |
| tree | d7d28521d7eee431cbbef8501d2a9fac99017d3a /smoketestoo_native | |
| parent | 52b32f617521fd160b043754f77f3a549fddc926 (diff) | |
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.
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/smoketest.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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" |