targetted re-work of cppunit pieces.

8 files changed, 44 insertions, 75 deletions

diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 12c920756f36..8919d26a2d53 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -26,15 +26,12 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
+#include <sal/types.h>
 
 #ifdef IOS
 #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_basegfx
 #endif
 
-// autogenerated file with codegen.pl
-
 #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 66cbcb09c72d..2cb7aba75fc6 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -26,11 +26,6 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
@@ -282,9 +277,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dsvgdimpex);
+    CPPUNIT_TEST_SUITE(b2dsvgdimpex);
     CPPUNIT_TEST(impex);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dsvgdimpex
 
 class b2drange : public CppUnit::TestFixture
@@ -301,9 +296,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2drange);
+    CPPUNIT_TEST_SUITE(b2drange);
     CPPUNIT_TEST(check);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 };
 
 class b2dpolyrange : public CppUnit::TestFixture
@@ -334,9 +329,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dpolyrange);
+    CPPUNIT_TEST_SUITE(b2dpolyrange);
     CPPUNIT_TEST(check);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 };
 
 class b2dhommatrix : public CppUnit::TestFixture
@@ -703,7 +698,7 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dhommatrix);
+    CPPUNIT_TEST_SUITE(b2dhommatrix);
     CPPUNIT_TEST(equal);
     CPPUNIT_TEST(identity);
     CPPUNIT_TEST(scale);
@@ -712,7 +707,7 @@ public:
     CPPUNIT_TEST(shear);
     CPPUNIT_TEST(multiply);
     CPPUNIT_TEST(decompose);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 
 }; // class b2dhommatrix
 
@@ -731,9 +726,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dpoint);
+    CPPUNIT_TEST_SUITE(b2dpoint);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dpoint
 
 
@@ -797,9 +792,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dpolygon);
+    CPPUNIT_TEST_SUITE(b2dpolygon);
     CPPUNIT_TEST(testBasics);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dpolygon
 
 
@@ -877,9 +872,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dpolygontools);
+    CPPUNIT_TEST_SUITE(b2dpolygontools);
     CPPUNIT_TEST(testIsRectangle);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dpolygontools
 
 
@@ -895,9 +890,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dpolypolygon);
+    CPPUNIT_TEST_SUITE(b2dpolypolygon);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dpolypolygon
 
 class b1Xrange : public CppUnit::TestFixture
@@ -960,9 +955,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b1Xrange);
+    CPPUNIT_TEST_SUITE(b1Xrange);
     CPPUNIT_TEST(check);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b1Xrange
 
 
@@ -1019,9 +1014,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b1ibox);
+    CPPUNIT_TEST_SUITE(b1ibox);
     CPPUNIT_TEST(TestBox);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b1ibox
 
 
@@ -1059,9 +1054,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2Xrange);
+    CPPUNIT_TEST_SUITE(b2Xrange);
     CPPUNIT_TEST(check);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2Xrange
 
 
@@ -1092,9 +1087,9 @@ public:
     // Change the following lines only, if you add, remove or rename
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
-    SAL_CPPUNIT_TEST_SUITE(b2ibox);
+    CPPUNIT_TEST_SUITE(b2ibox);
     CPPUNIT_TEST(TestBox);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2ibox
 
 
@@ -1112,9 +1107,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b2dtuple);
+    CPPUNIT_TEST_SUITE(b2dtuple);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dtuple
 
 class bcolor : public CppUnit::TestFixture
@@ -1274,11 +1269,11 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(bcolor);
+    CPPUNIT_TEST_SUITE(bcolor);
     CPPUNIT_TEST(hslTest);
     CPPUNIT_TEST(hsvTest);
     CPPUNIT_TEST(ciexyzTest);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b2dvector
 
 // -----------------------------------------------------------------------------
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index df9dfc129848..682a5314f12f 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
+#include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
@@ -61,9 +57,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b3dhommatrix);
+    CPPUNIT_TEST_SUITE(b3dhommatrix);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b3dhommatrix
 
 
@@ -90,9 +86,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b3dpoint);
+    CPPUNIT_TEST_SUITE(b3dpoint);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b3dpoint
 
 
@@ -117,9 +113,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b3drange);
+    CPPUNIT_TEST_SUITE(b3drange);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b3drange
 
 
@@ -146,9 +142,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b3dtuple);
+    CPPUNIT_TEST_SUITE(b3dtuple);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b3dtuple
 
 
@@ -173,9 +169,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(b3dvector);
+    CPPUNIT_TEST_SUITE(b3dvector);
     CPPUNIT_TEST(EmptyMethod);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class b3dvector
 
 // -----------------------------------------------------------------------------
diff --git a/basegfx/test/basegfx_cppunittester_all.cxx b/basegfx/test/basegfx_cppunittester_all.cxx
index 7c6616bdab99..b5f89921fe02 100644
--- a/basegfx/test/basegfx_cppunittester_all.cxx
+++ b/basegfx/test/basegfx_cppunittester_all.cxx
@@ -26,9 +26,6 @@
 *
 ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
 #include <cstdlib>
 #include <iostream>
 #include <limits>
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index 2735508b3238..64718241575b 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
+#include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index a886f6c67525..ecf9ec0caa3d 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
+#include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index be039a99f571..4f3253e00eb7 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
+#include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index a8da22f3cda2..3ff4afe7a8d9 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -26,11 +26,7 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
-// autogenerated file with codegen.pl
-
+#include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"