summaryrefslogtreecommitdiff
path: root/tools/qa
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-09-12 21:24:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-09-12 22:47:50 +0200
commitd996328cd5f46eeed2df0cbd510eda28e2f7cef9 (patch)
treed7d28521d7eee431cbbef8501d2a9fac99017d3a /tools/qa
parent52b32f617521fd160b043754f77f3a549fddc926 (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 'tools/qa')
-rw-r--r--tools/qa/cppunit/test_pathutils.cxx7
-rw-r--r--tools/qa/cppunit/test_reversemap.cxx11
-rw-r--r--tools/qa/cppunit/test_stream.cxx7
-rw-r--r--tools/qa/cppunit/tools_cppunittester_all.cxx1
-rw-r--r--tools/qa/urlobj/tools_urlobj_test.cxx3
5 files changed, 23 insertions, 6 deletions
diff --git a/tools/qa/cppunit/test_pathutils.cxx b/tools/qa/cppunit/test_pathutils.cxx
index 842e65951ee0..6df1d49c7606 100644
--- a/tools/qa/cppunit/test_pathutils.cxx
+++ b/tools/qa/cppunit/test_pathutils.cxx
@@ -27,10 +27,15 @@
************************************************************************/
#include "precompiled_tools.hxx"
-#include <sal/cppunit.h>
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cwchar>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
#include "tools/pathutils.hxx"
namespace {
diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index 92c349ce55d0..c2a679896ca7 100644
--- a/tools/qa/cppunit/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -26,13 +26,18 @@
* instead of those above.
*/
+#include "precompiled_tools.hxx"
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tools_reversemap
#endif
-#include "precompiled_tools.hxx"
-#include <sal/cppunit.h>
-
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
#include <rtl/ustring.hxx>
#include <vector>
diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx
index 515952d93563..8cf46af38316 100644
--- a/tools/qa/cppunit/test_stream.cxx
+++ b/tools/qa/cppunit/test_stream.cxx
@@ -27,8 +27,13 @@
*/
#include "precompiled_tools.hxx"
-#include <sal/cppunit.h>
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
#include <tools/stream.hxx>
#include <sstream>
diff --git a/tools/qa/cppunit/tools_cppunittester_all.cxx b/tools/qa/cppunit/tools_cppunittester_all.cxx
index dff25970dcad..bf8c57dfb3db 100644
--- a/tools/qa/cppunit/tools_cppunittester_all.cxx
+++ b/tools/qa/cppunit/tools_cppunittester_all.cxx
@@ -27,6 +27,7 @@
************************************************************************/
#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cstdlib>
#include <iostream>
diff --git a/tools/qa/urlobj/tools_urlobj_test.cxx b/tools/qa/urlobj/tools_urlobj_test.cxx
index 4b476e7ad388..0e9a16a59624 100644
--- a/tools/qa/urlobj/tools_urlobj_test.cxx
+++ b/tools/qa/urlobj/tools_urlobj_test.cxx
@@ -26,7 +26,8 @@
* instead of those above.
*/
- #include <cppunit/simpleheader.hxx>
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <urlobj.hxx>