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 /basebmp | |
| 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 'basebmp')
| -rw-r--r-- | basebmp/test/basebmp_cppunittester_all.cxx | 1 | ||||
| -rw-r--r-- | basebmp/test/basictest.cxx | 4 | ||||
| -rw-r--r-- | basebmp/test/bmpmasktest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/bmptest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/cliptest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/filltest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/linetest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/masktest.cxx | 3 | ||||
| -rw-r--r-- | basebmp/test/polytest.cxx | 3 |
9 files changed, 25 insertions, 1 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" |