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 /comphelper/qa | |
| 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 'comphelper/qa')
| -rw-r--r-- | comphelper/qa/string/test_string.cxx | 6 | ||||
| -rw-r--r-- | comphelper/qa/weakbag/test_weakbag.cxx | 1 | ||||
| -rw-r--r-- | comphelper/qa/weakbag/test_weakbag_noadditional.cxx | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 21d84c9142fe..db6d52ea1128 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -27,12 +27,16 @@ ************************************************************************/ #include "precompiled_comphelper.hxx" -#include "sal/cppunit.h" +#include "sal/precppunit.hxx" #include <comphelper/string.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/i18n/CharType.hpp> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx index 84767f0ede0e..9e7139857c48 100644 --- a/comphelper/qa/weakbag/test_weakbag.cxx +++ b/comphelper/qa/weakbag/test_weakbag.cxx @@ -28,6 +28,7 @@ #include "precompiled_comphelper.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XInterface.hpp" diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx index 9f3bfe5061ab..f101e0785515 100644 --- a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx +++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/plugin/TestPlugIn.h> CPPUNIT_PLUGIN_IMPLEMENT(); |