summaryrefslogtreecommitdiff
path: root/cppuhelper/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 /cppuhelper/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 'cppuhelper/qa')
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx3
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx4
-rw-r--r--cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx1
-rw-r--r--cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx1
-rw-r--r--cppuhelper/qa/unourl/cppu_unourl.cxx3
-rw-r--r--cppuhelper/qa/weak/test_weak.cxx4
6 files changed, 12 insertions, 4 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 09ec884d46c2..7d40a8d1194c 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
#include <string.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index cad8c663539c..2ca98f9200b3 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -28,13 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppuhelper.hxx"
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_cppuhelper_propertysetmixin
#endif
-#include "sal/config.h"
-
#include "test/cppuhelper/propertysetmixin/CppSupplier.hpp"
#include "test/cppuhelper/propertysetmixin/JavaSupplier.hpp"
#include "test/cppuhelper/propertysetmixin/XSupplier.hpp"
diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx
index a1085a6aad00..82a05401a24c 100644
--- a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx
+++ b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx
@@ -27,6 +27,7 @@
************************************************************************/
#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cstdlib>
#include <iostream>
diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx
index 90d7f8b549eb..44b913b84800 100644
--- a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx
+++ b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx
@@ -27,6 +27,7 @@
************************************************************************/
#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cstdlib>
#include <iostream>
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index df6c63e15d2c..d7ad8a641ea8 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 0a0cae46a8fb..b9ba6354b134 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -28,13 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppuhelper.hxx"
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#include "sal/config.h"
-
#include "com/sun/star/lang/DisposedException.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"