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 /i18npool | |
| 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 'i18npool')
| -rw-r--r-- | i18npool/qa/cppunit/i18npool_cppunittester_all.cxx | 2 | ||||
| -rw-r--r-- | i18npool/qa/cppunit/test_breakiterator.cxx | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx index f56002f16ec3..d431259a6edc 100644 --- a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx +++ b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx @@ -27,8 +27,8 @@ ************************************************************************/ #include "precompiled_i18npool.hxx" - #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 85faeb972e92..ab5936aa0934 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -25,21 +25,26 @@ * instead of those above. */ +#include "precompiled_i18npool.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_i18npool_breakiterator #endif -#include "precompiled_i18npool.hxx" - #include <cppuhelper/compbase1.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/basemutex.hxx> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/ScriptType.hdl> #include <rtl/strbuf.hxx> -#include <sal/cppunit.h> #include <string.h> |