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 /sc/qa | |
parent | sb140: #i114669# appears be duplicate of fixed i114718, so re-enabling test (diff) | |
download | core-d996328cd5f46eeed2df0cbd510eda28e2f7cef9.tar.gz core-d996328cd5f46eeed2df0cbd510eda28e2f7cef9.zip |
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 'sc/qa')
-rw-r--r-- | sc/qa/unit/filters-test.cxx | 9 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 6406387a1763..40e64ae3272c 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/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 <osl/file.hxx> #include <osl/process.h> diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 8b30366eafbd..9b355dc7448c 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -40,9 +40,14 @@ // services we need, and in what .so they are implemented -#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 <osl/file.hxx> #include <osl/process.h> |