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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/qa/core/Test-BigPtrArray.cxx | 9 | ||||
| -rw-r--r-- | sw/qa/core/filters-test.cxx | 9 | ||||
| -rw-r--r-- | sw/qa/core/swdoc-test.cxx | 9 |
3 files changed, 20 insertions, 7 deletions
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index 0930e934d820..c3c1a37a4c43 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -28,15 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" +#include "sal/precppunit.hxx" + +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" //#define TIMELOG for measuring performance #include <string.h> #include <stdlib.h> -#include <sal/cppunit.h> - -#include <sal/config.h> #include <rtl/logfile.hxx> #include <bparr.hxx> diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index c9616ec4be98..9084c1e351d4 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -27,9 +27,14 @@ * instead of those above. */ -#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 <sal/config.h> #include <osl/file.hxx> #include <osl/process.h> diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx index f87a2c239d67..903b6dd207d3 100644 --- a/sw/qa/core/swdoc-test.cxx +++ b/sw/qa/core/swdoc-test.cxx @@ -27,9 +27,14 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ -#include <sal/cppunit.h> -#include <sal/config.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 <osl/file.hxx> #include <osl/process.h> |