From d996328cd5f46eeed2df0cbd510eda28e2f7cef9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Sep 2011 21:24:31 +0200 Subject: 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. --- sal/qa/rtl/alloc/rtl_alloc.cxx | 4 ++-- sal/qa/rtl/cipher/rtl_cipher.cxx | 2 ++ sal/qa/rtl/crc32/rtl_crc32.cxx | 3 ++- sal/qa/rtl/digest/rtl_digest.cxx | 2 ++ sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 3 +++ sal/qa/rtl/locale/rtl_locale.cxx | 3 ++- sal/qa/rtl/logfile/rtl_logfile.cxx | 3 +++ sal/qa/rtl/math/rtl_math.cxx | 3 +++ sal/qa/rtl/math/test-rtl-math.cxx | 6 +++++- sal/qa/rtl/math/test_rtl_math.cxx | 9 +++++++-- sal/qa/rtl/ostring/rtl_OString2.cxx | 3 +++ sal/qa/rtl/ostring/rtl_str.cxx | 2 ++ sal/qa/rtl/ostring/rtl_string.cxx | 2 ++ sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx | 2 ++ sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 2 ++ sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx | 2 ++ sal/qa/rtl/random/rtl_random.cxx | 2 ++ sal/qa/rtl/strings/test_oustring_compare.cxx | 2 ++ sal/qa/rtl/strings/test_oustring_convert.cxx | 2 ++ sal/qa/rtl/strings/test_oustring_endswith.cxx | 2 ++ sal/qa/rtl/strings/test_oustring_noadditional.cxx | 2 ++ 21 files changed, 54 insertions(+), 7 deletions(-) (limited to 'sal/qa/rtl') diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 3a3852a3b7e5..5523af2cf8f0 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -26,10 +26,10 @@ * ************************************************************************/ - // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -// autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 383f56da4b88..fcf2cc4e0d19 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 1e054a948882..222691ffd325 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -29,7 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -// autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index ffd0af4126d2..553271166f03 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index b44e5432cb4d..0a09a91da99f 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -28,6 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 1cf34c08603e..0e3d255e5984 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -29,7 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -// autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 2b669478d010..a94d54583ea6 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -29,6 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + // LLA: // this file is converted to use with testshl2 // original was placed in sal/test/textenc.cxx diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx index 9fe5c82ae116..41e55d64709c 100644 --- a/sal/qa/rtl/math/rtl_math.cxx +++ b/sal/qa/rtl/math/rtl_math.cxx @@ -29,6 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef WIN32 // LLA: take a look into Microsofts math.h implementation, why this define is need #define _USE_MATH_DEFINES diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index 41b4ea21138d..eb62fa430fa6 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -26,8 +26,12 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" -#include +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/math.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx index a5061ac80549..3848c01a115a 100644 --- a/sal/qa/rtl/math/test_rtl_math.cxx +++ b/sal/qa/rtl/math/test_rtl_math.cxx @@ -26,6 +26,13 @@ * ************************************************************************/ +#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 "rtl/math.h" #include "rtl/math.hxx" #include "rtl/strbuf.hxx" @@ -38,8 +45,6 @@ #include -#include - namespace { struct FloatTraits diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index a4a50d8ca880..cc13027afa7f 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -29,6 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + // autogenerated file with codegen.pl // There exist some more test code in sal/qa/rtl_strings/rtl_OString.cxx diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index b04a49d8b500..6092309c3bed 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index 0b5e169d49bd..c906e2a44689 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx index 18e8a634460b..2505e2eabf43 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx index df38ce6295bb..9afd1fbba2b9 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx index 13e75a476adf..c66223b2bb58 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index 0ee897291c91..ba739e5bc451 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx index 016ff94f2735..a992b5843089 100644 --- a/sal/qa/rtl/strings/test_oustring_compare.cxx +++ b/sal/qa/rtl/strings/test_oustring_compare.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx index f35edbfa081f..2cff765cc3ee 100644 --- a/sal/qa/rtl/strings/test_oustring_convert.cxx +++ b/sal/qa/rtl/strings/test_oustring_convert.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx index 7a9c7df6f65a..b41b8bf7f696 100644 --- a/sal/qa/rtl/strings/test_oustring_endswith.cxx +++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include #include diff --git a/sal/qa/rtl/strings/test_oustring_noadditional.cxx b/sal/qa/rtl/strings/test_oustring_noadditional.cxx index 18e8a634460b..2505e2eabf43 100644 --- a/sal/qa/rtl/strings/test_oustring_noadditional.cxx +++ b/sal/qa/rtl/strings/test_oustring_noadditional.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include -- cgit