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 /test/source | |
| 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 'test/source')
| -rw-r--r-- | test/source/cpp/officeconnection.cxx | 5 | ||||
| -rw-r--r-- | test/source/cpp/uniquepipename.cxx | 1 | ||||
| -rw-r--r-- | test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx index 9225411ca601..fe3ad5a05a48 100644 --- a/test/source/cpp/officeconnection.cxx +++ b/test/source/cpp/officeconnection.cxx @@ -25,6 +25,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include "com/sun/star/bridge/UnoUrlResolver.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" @@ -34,13 +35,11 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/bootstrap.hxx" - #include "cppunit/TestAssert.h" - #include "osl/process.h" #include "osl/time.h" +#include "sal/macros.h" #include "sal/types.h" -#include <sal/macros.h> #include "test/officeconnection.hxx" #include "test/toabsolutefileurl.hxx" #include "test/uniquepipename.hxx" diff --git a/test/source/cpp/uniquepipename.cxx b/test/source/cpp/uniquepipename.cxx index 8cb409f621ee..1725ca218918 100644 --- a/test/source/cpp/uniquepipename.cxx +++ b/test/source/cpp/uniquepipename.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include "osl/process.h" diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index ed2c4f7d4887..7e7e0000c49a 100644 --- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -26,6 +26,7 @@ #include "precompiled_test.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include <limits> #include <string> @@ -35,6 +36,7 @@ #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Exception.hpp" #include "cppuhelper/exc_hlp.hxx" +#include "cppunit/Message.h" #include "osl/thread.h" #include "rtl/string.hxx" #include "rtl/ustring.h" @@ -42,7 +44,6 @@ #include "sal/types.h" #include "protectorfactory.hxx" -#include "cppunit/Message.h" namespace { |