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.

6 files changed, 25 insertions, 7 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>
 
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index a814fb2fea83..4c4e21f7537d 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.cxx
@@ -29,7 +29,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
-// autogenerated file with codegen.pl
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>