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 /basegfx | |
| 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 'basegfx')
| -rw-r--r-- | basegfx/test/basegfx1d.cxx | 4 | ||||
| -rw-r--r-- | basegfx/test/basegfx2d.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/basegfx3d.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/basegfx_cppunittester_all.cxx | 1 | ||||
| -rw-r--r-- | basegfx/test/basegfxtools.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/boxclipper.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/clipstate.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/genericclipper.cxx | 2 |
8 files changed, 16 insertions, 1 deletions
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" |