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 | |
| 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.
133 files changed, 433 insertions, 123 deletions
diff --git a/basebmp/test/basebmp_cppunittester_all.cxx b/basebmp/test/basebmp_cppunittester_all.cxx index 53a8113cfda6..076fe43a8e36 100644 --- a/basebmp/test/basebmp_cppunittester_all.cxx +++ b/basebmp/test/basebmp_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index a24852992f53..246a25a5e7a1 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -26,13 +26,15 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basebmp #endif // autogenerated file with codegen.pl -#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 5ba477484903..755128b303f1 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 7b3a2cbcb18f..6a42c6149f50 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index c41edf3e28a8..08812a9354ce 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index d15fa1010050..3cddc4a7a166 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index cee66f4d709b..885235d128c3 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 239a069bf564..3847d60c3657 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 99aba1a06fc4..0be253ead882 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -28,6 +28,9 @@ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 860a6dc9a81b..0134dfeb758a 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basegfx #endif @@ -34,7 +37,6 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 6cccd67a9c21..0d14638797fb 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index 691b51a5f981..c488f977c55b 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/basegfx/test/basegfx_cppunittester_all.cxx b/basegfx/test/basegfx_cppunittester_all.cxx index 7508fe1cb683..7c6616bdab99 100644 --- a/basegfx/test/basegfx_cppunittester_all.cxx +++ b/basegfx/test/basegfx_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index 4380aafedad8..18c0721294e4 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 4d809bb47404..2be9df545844 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index d8c1066c85f1..179f3768cdb2 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 81d8acdf30ad..22b6bda9450c 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basegfx.hxx" diff --git a/binaryurp/qa/binaryurp_cppunittester_all.cxx b/binaryurp/qa/binaryurp_cppunittester_all.cxx index 31e82e454c78..d88d5ab5e84d 100644 --- a/binaryurp/qa/binaryurp_cppunittester_all.cxx +++ b/binaryurp/qa/binaryurp_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx index c47f6f7e6042..a831f4d7e1fb 100644 --- a/binaryurp/qa/test-cache.cxx +++ b/binaryurp/qa/test-cache.cxx @@ -26,12 +26,13 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_cache #endif -#include "sal/config.h" - #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx index 5c4940ddb634..74ee12c81624 100644 --- a/binaryurp/qa/test-unmarshal.cxx +++ b/binaryurp/qa/test-unmarshal.cxx @@ -26,12 +26,13 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_unmarshal #endif -#include "sal/config.h" - #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "cppu/unotype.hxx" diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 21d84c9142fe..db6d52ea1128 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -27,12 +27,16 @@ ************************************************************************/ #include "precompiled_comphelper.hxx" -#include "sal/cppunit.h" +#include "sal/precppunit.hxx" #include <comphelper/string.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/i18n/CharType.hpp> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/comphelper/qa/weakbag/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx index 84767f0ede0e..9e7139857c48 100644 --- a/comphelper/qa/weakbag/test_weakbag.cxx +++ b/comphelper/qa/weakbag/test_weakbag.cxx @@ -28,6 +28,7 @@ #include "precompiled_comphelper.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XInterface.hpp" diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx index 9f3bfe5061ab..f101e0785515 100644 --- a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx +++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/plugin/TestPlugIn.h> CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/cppu/qa/cppu_cppunittester_all.cxx b/cppu/qa/cppu_cppunittester_all.cxx index e77c046bf8da..bf2a680e63b8 100644 --- a/cppu/qa/cppu_cppunittester_all.cxx +++ b/cppu/qa/cppu_cppunittester_all.cxx @@ -27,8 +27,8 @@ ************************************************************************/ #include "precompiled_cppu.hxx" - #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 8e71264209fc..850eb10a904c 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include "FILE.hpp" #include "lconv.hpp" diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 4c7f58d9bd43..ddee0fbc03ae 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_any #endif -#include "sal/config.h" - #include <stdlib.h> // wntmsci10 does not like <cstdlib> #include <cppunit/TestSuite.h> diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index da7d389099bc..53f57cd7d323 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -27,13 +27,13 @@ ************************************************************************/ #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_recursion #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 8bc21a02ebe3..a2509bff1028 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_reference #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 4173bf8a3534..ee40c853b9b8 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_unotype #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 09ec884d46c2..7d40a8d1194c 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <string.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index cad8c663539c..2ca98f9200b3 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_cppuhelper_propertysetmixin #endif -#include "sal/config.h" - #include "test/cppuhelper/propertysetmixin/CppSupplier.hpp" #include "test/cppuhelper/propertysetmixin/JavaSupplier.hpp" #include "test/cppuhelper/propertysetmixin/XSupplier.hpp" diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx index a1085a6aad00..82a05401a24c 100644 --- a/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx +++ b/cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx index 90d7f8b549eb..44b913b84800 100644 --- a/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx +++ b/cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index df6c63e15d2c..d7ad8a641ea8 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index 0a0cae46a8fb..b9ba6354b134 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include "sal/config.h" - #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 480172bb5abe..6a08b12462c3 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_desktop.hxx" - #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstddef> diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx index 5d67b62f82f1..519d916fe57b 100644 --- a/editeng/qa/items/borderline_test.cxx +++ b/editeng/qa/items/borderline_test.cxx @@ -27,12 +27,14 @@ * instead of those above. */ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <editeng/borderline.hxx> -#include <sal/cppunit.h> #define TEST_WIDTH long( 40 ) diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 07845ba63941..c0519595f12d 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -26,6 +26,8 @@ */ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_filter.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx index 460db0fd7b8d..b0666e6a5863 100644 --- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx +++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx @@ -26,7 +26,13 @@ * 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 <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> 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> diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx index e4072bb3e492..dc776f8734a9 100644 --- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx +++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx @@ -26,7 +26,13 @@ * 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 <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index fbf9fe49b336..fa20573aad39 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -1,10 +1,13 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include <sal/cppunit.h> +#include "cppunit/plugin/TestPlugIn.h" #include "cow_wrapper_clients.hxx" diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index 381b8a31d541..4db17fd40547 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.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/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx index ee45744c1338..117bd02987c3 100644 --- a/o3tl/qa/test-range.cxx +++ b/o3tl/qa/test-range.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/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 1e3ec7a98175..6cb207ff26eb 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -1,6 +1,9 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 78da5dd9cf7c..49ae0b3e7338 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -28,6 +28,7 @@ #include "precompiled_sal.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef WNT #include <windows.h> diff --git a/sal/inc/cppunittester/protectorfactory.hxx b/sal/inc/cppunittester/protectorfactory.hxx index 916f89f74d40..0d730e323a32 100644 --- a/sal/inc/cppunittester/protectorfactory.hxx +++ b/sal/inc/cppunittester/protectorfactory.hxx @@ -29,6 +29,7 @@ #define INCLUDED_CPPUNITTESTER_PROTECTORFACTORY_HXX #include "sal/config.h" +#include "sal/precppunit.hxx" #include "sal/types.h" diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h deleted file mode 100644 index 0d085c2b65ea..000000000000 --- a/sal/inc/sal/cppunit.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SAL_CPPUNIT_H_ -#define _SAL_CPPUNIT_H_ - -#include <sal/types.h> - -#include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> -#include <cppunit/Protector.h> - -#undef CPPUNIT_PLUGIN_EXPORT -#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/inc/sal/precppunit.hxx b/sal/inc/sal/precppunit.hxx new file mode 100644 index 000000000000..a0f7c942f27c --- /dev/null +++ b/sal/inc/sal/precppunit.hxx @@ -0,0 +1,39 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2011 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +#ifndef INCLUDED_SAL_PRECPPUNIT_HXX +#define INCLUDED_SAL_PRECPPUNIT_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +// Overwrite the way CppUnit test plug-ins export the test function, adapting it +// to OOo's symbol visibility framework: +#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT + +#endif diff --git a/sal/prj/d.lst b/sal/prj/d.lst index 981fc5ecbe0e..ac6bc63ecf80 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -9,6 +9,7 @@ mkdir: %_DEST%\inc\systools\win32 ..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc\protectorfactory.hxx ..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc\rtlbootstrap.mk ..\inc\sal\*.h %_DEST%\inc\sal\*.h +..\inc\sal\precppunit.hxx %_DEST%\inc\sal\precppunit.hxx ..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc\sal\typesizes.h ..\inc\osl\*.h %_DEST%\inc\osl\*.h ..\inc\osl\*.hxx %_DEST%\inc\osl\*.hxx diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx index f715c90134e2..3a0e3a5d017a 100644 --- a/sal/qa/ByteSequence/ByteSequence.cxx +++ b/sal/qa/ByteSequence/ByteSequence.cxx @@ -28,6 +28,7 @@ #include "precompiled_sal.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index ba6c3260f52a..4bfadc403781 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.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 <rtl/string.hxx> #include <rtl_String_Const.h> diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index e000e7c415a0..e4c788723ac3 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -29,6 +29,9 @@ #ifndef _OSL_CONDITION_CONST_H_ #define _OSL_CONDITION_CONST_H_ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index a1683e196093..f69749f16b01 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.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" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_osl_File diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 04f2f5a36172..c2432438f53d 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.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" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_old_test_file diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 56135301e4cb..f5a4a27345e6 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.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" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tcwf diff --git a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx index 4d9e65586bff..534b798c4556 100644 --- a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx +++ b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx @@ -27,6 +27,7 @@ #include "precompiled_sal.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 9074a281ff9a..599ee14b03d8 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -29,6 +29,8 @@ #ifndef _OSL_MODULE_CONST_H_ #define _OSL_MODULE_CONST_H_ +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index b4b2ecc8f4bd..ff42b64f4911 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -29,8 +29,13 @@ //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ -#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_Mutex_Const.h> using namespace osl; diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index ba5f8dadbc74..97705dcf3a60 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -30,7 +30,13 @@ // include files //------------------------------------------------------------------------ -#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 "test/uniquepipename.hxx" #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index de0589f45e69..1dd086086c57 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.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" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_Thread diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index ae09ead5f154..67d9282809d4 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.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" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_osl_process diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index f2695a3084c1..2e36b791c594 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -30,12 +30,16 @@ // this file is converted to use with testshl2 // original was placed in sal/test/textenc.cxx +#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 <stdio.h> #include <osl/profile.h> -#include <sal/cppunit.h> - //================================================================================================== // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 6ec52747cb50..21461cab41c7 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.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" //------------------------------------------------------------------------ // header file diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index 197745f7dd8d..0c3a242255cf 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -29,6 +29,9 @@ #ifndef _OSL_SECURITY_CONST_H_ #define _OSL_SECURITY_CONST_H_ +#include "sal/config.h" +#include "sal/precppunit.hxx" + #if ( defined WNT ) // Windows #include <io.h> #endif diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index b969ad511913..eb5aef6bb161 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx @@ -26,13 +26,17 @@ ************************************************************************/ #include "sal/config.h" -#include <sal/cppunit.h> +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> #include <limits> #include "boost/noncopyable.hpp" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "osl/thread.hxx" namespace { diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index a648e475a725..a19d6310c5d4 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index bf47ea327928..f8a567012f8d 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 111c690439fe..eed51ed0e786 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index f16dc16782ef..df3a10bb30fe 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index bee02b978f4c..0eb9f055cb89 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 476fadea3d49..13e9521e9d52 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 120d9fa24a91..1b3696429047 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.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 files diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index c2683d6ead46..ffe7eb5ca37b 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.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" /** test coder preface: 1. the BSD socket function will meet "unresolved external symbol error" on Windows platform diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 1aaab989e4a8..ee2dc88d88c0 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.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" + #include "sockethelper.hxx" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx index 9dbc307907b1..80e4f5b46901 100644 --- a/sal/qa/osl/thread/test_thread.cxx +++ b/sal/qa/osl/thread/test_thread.cxx @@ -28,8 +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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <rtl/alloc.h> #include <cppunit/TestFixture.h> 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 <cstring> 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> 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 <osl/thread.h> #include <rtl/locale.hxx> 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 <sal/cppunit.h> +#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 <stdlib.h> -#include <sal/cppunit.h> - 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/plugin/TestPlugIn.h> 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 <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> 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 <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> 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 <algorithm> 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> 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 <cppunit/plugin/TestPlugIn.h> diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx index 0b7cdd661d3d..e309e22cfe66 100644 --- a/sal/qa/sal/test_types.cxx +++ b/sal/qa/sal/test_types.cxx @@ -28,6 +28,7 @@ #include "precompiled_sal.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstddef> #include <stdio.h> // C99 snprintf not necessarily in <cstdio> diff --git a/sal/qa/static/sal_cppunittester_all.cxx b/sal/qa/static/sal_cppunittester_all.cxx index 4c3d942c187f..cdcb09b71824 100644 --- a/sal/qa/static/sal_cppunittester_all.cxx +++ b/sal/qa/static/sal_cppunittester_all.cxx @@ -28,6 +28,7 @@ #include "precompiled_sal.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/sal/workben/t_osl_getVolInfo.cxx b/sal/workben/t_osl_getVolInfo.cxx index 7504cd8dfdff..3305364a8d1a 100644 --- a/sal/workben/t_osl_getVolInfo.cxx +++ b/sal/workben/t_osl_getVolInfo.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 <cppunit/simpleheader.hxx> #include <osl/file.h> diff --git a/sal/workben/t_osl_joinProcess.cxx b/sal/workben/t_osl_joinProcess.cxx index 40d19fe50c41..c1e256b18566 100644 --- a/sal/workben/t_osl_joinProcess.cxx +++ b/sal/workben/t_osl_joinProcess.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 <cppunit/simpleheader.hxx> #include <osl/process.h> diff --git a/sax/qa/cppunit/sax_cppunittester_all.cxx b/sax/qa/cppunit/sax_cppunittester_all.cxx index b988ee71f869..3e81161bbb3d 100644 --- a/sax/qa/cppunit/sax_cppunittester_all.cxx +++ b/sax/qa/cppunit/sax_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 562b39910fe2..1d514f5719fa 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -26,7 +26,9 @@ * ************************************************************************/ -#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> 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> diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx index c34f72454c67..9ac913b82864 100644 --- a/sd/qa/unit/uimpress.cxx +++ b/sd/qa/unit/uimpress.cxx @@ -27,9 +27,13 @@ */ #include "precompiled_sd.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" -#include <sal/config.h> -#include <sal/cppunit.h> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 4a94890f21df..c17e82f746ec 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -26,7 +26,14 @@ * ************************************************************************/ -#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 <rtl/ustrbuf.hxx> #include <com/sun/star/util/DateTime.hpp> 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> diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 447d12eac092..b77ed701c0ea 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include "boost/noncopyable.hpp" #include "com/sun/star/awt/AsyncCallback.hpp" @@ -49,11 +50,14 @@ #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/util/URL.hpp" #include "cppuhelper/implbase1.hxx" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "osl/conditn.hxx" #include "osl/diagnose.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "sal/cppunit.h" #include "test/gettestargument.hxx" #include "test/officeconnection.hxx" #include "test/oustringostreaminserter.hxx" diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index f7b282c60e6d..47f26b89a4f7 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_starmath.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 40e058bd0598..93630c6cd8bf 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -27,9 +27,13 @@ */ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_starmath.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" -#include <sal/config.h> -#include <sal/cppunit.h> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx index c206def13830..e5d7c02a8ef6 100644 --- a/svl/qa/test_URIHelper.cxx +++ b/svl/qa/test_URIHelper.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" - #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 201a20ee1e57..31484ea639df 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -27,6 +27,8 @@ */ #include "precompiled_svl.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef WNT # undef ERROR diff --git a/svtools/qa/cppunit/filters-test.cxx b/svtools/qa/cppunit/filters-test.cxx index 8181685f7784..4cdd46f4c6e4 100644 --- a/svtools/qa/cppunit/filters-test.cxx +++ b/svtools/qa/cppunit/filters-test.cxx @@ -27,8 +27,13 @@ * 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/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index 0930e934d820..c3c1a37a4c43 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -28,15 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" +#include "sal/precppunit.hxx" + +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" //#define TIMELOG for measuring performance #include <string.h> #include <stdlib.h> -#include <sal/cppunit.h> - -#include <sal/config.h> #include <rtl/logfile.hxx> #include <bparr.hxx> diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index c9616ec4be98..9084c1e351d4 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/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 <sal/config.h> #include <osl/file.hxx> #include <osl/process.h> diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx index f87a2c239d67..903b6dd207d3 100644 --- a/sw/qa/core/swdoc-test.cxx +++ b/sw/qa/core/swdoc-test.cxx @@ -27,9 +27,14 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ -#include <sal/cppunit.h> -#include <sal/config.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/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 { diff --git a/tools/qa/cppunit/test_pathutils.cxx b/tools/qa/cppunit/test_pathutils.cxx index 842e65951ee0..6df1d49c7606 100644 --- a/tools/qa/cppunit/test_pathutils.cxx +++ b/tools/qa/cppunit/test_pathutils.cxx @@ -27,10 +27,15 @@ ************************************************************************/ #include "precompiled_tools.hxx" -#include <sal/cppunit.h> +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <cwchar> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "tools/pathutils.hxx" namespace { diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx index 92c349ce55d0..c2a679896ca7 100644 --- a/tools/qa/cppunit/test_reversemap.cxx +++ b/tools/qa/cppunit/test_reversemap.cxx @@ -26,13 +26,18 @@ * instead of those above. */ +#include "precompiled_tools.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_tools_reversemap #endif -#include "precompiled_tools.hxx" -#include <sal/cppunit.h> - +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include <rtl/ustring.hxx> #include <vector> diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index 515952d93563..8cf46af38316 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -27,8 +27,13 @@ */ #include "precompiled_tools.hxx" -#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 <tools/stream.hxx> #include <sstream> diff --git a/tools/qa/cppunit/tools_cppunittester_all.cxx b/tools/qa/cppunit/tools_cppunittester_all.cxx index dff25970dcad..bf8c57dfb3db 100644 --- a/tools/qa/cppunit/tools_cppunittester_all.cxx +++ b/tools/qa/cppunit/tools_cppunittester_all.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/tools/qa/urlobj/tools_urlobj_test.cxx b/tools/qa/urlobj/tools_urlobj_test.cxx index 4b476e7ad388..0e9a16a59624 100644 --- a/tools/qa/urlobj/tools_urlobj_test.cxx +++ b/tools/qa/urlobj/tools_urlobj_test.cxx @@ -26,7 +26,8 @@ * instead of those above. */ - #include <cppunit/simpleheader.hxx> +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <urlobj.hxx> diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx index a814fb2fea83..4c4e21f7537d 100644 --- a/tools/test/tests.cxx +++ b/tools/test/tests.cxx @@ -29,7 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -// autogenerated file with codegen.pl +#include "sal/config.h" +#include "sal/precppunit.hxx" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index e995f7360853..0468c1d40768 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -1,9 +1,15 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // autogenerated file with codegen.pl -#include <sal/cppunit.h> +#include "sal/config.h" +#include "sal/precppunit.hxx" + #include <osl/process.h> #include <cppuhelper/bootstrap.hxx> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include <ucbhelper/contentbroker.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index b9944bb8983d..64e2faef8377 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -26,7 +26,13 @@ * 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 <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx index ef4d0a72809a..8a9d03a2d3da 100644 --- a/xmlsecurity/qa/certext/SanCertExt.cxx +++ b/xmlsecurity/qa/certext/SanCertExt.cxx @@ -27,6 +27,8 @@ #include "precompiled_xmlsecurity.hxx" #include "sal/config.h" +#include "sal/precppunit.hxx" + #include "test/officeconnection.hxx" #include <com/sun/star/security/XSanExtension.hpp> @@ -41,7 +43,10 @@ #include "com/sun/star/uno/Reference.hxx" #include "cppuhelper/bootstrap.hxx" -#include <sal/cppunit.h> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "sal/types.h" #include "comphelper/sequence.hxx" #include <rtl/ustring.hxx> |