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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/test/slidetest.cxx | 8 | ||||
| -rw-r--r-- | slideshow/test/testshape.cxx | 3 | ||||
| -rw-r--r-- | slideshow/test/testview.cxx | 3 | ||||
| -rw-r--r-- | slideshow/test/views.cxx | 3 |
4 files changed, 16 insertions, 1 deletions
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index cfc5f60fcf85..bd70ff307837 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -26,7 +26,13 @@ * ************************************************************************/ -#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 <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 4bd7b934ff6e..5f3f3f0c5c85 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index 7d40e03ce63d..3473f0467079 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index d27a55a7795f..2e88dddd83c6 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> |