1 files changed, 21 insertions, 24 deletions

diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index a4d5bfb4c394..2b982e51e7f1 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -26,12 +26,9 @@
  *
  ************************************************************************/
 
-
-#include "sal/config.h"
-#include "sal/precppunit.hxx"
-
 #include <cstring>
 
+#include <sal/types.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
@@ -103,7 +100,7 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(create);
+    CPPUNIT_TEST_SUITE(create);
     CPPUNIT_TEST(create_001);
     CPPUNIT_TEST(create_002);
     CPPUNIT_TEST(create_003);
@@ -112,7 +109,7 @@ public:
     CPPUNIT_TEST(create_006);
     CPPUNIT_TEST(create_007);
     CPPUNIT_TEST(create_008);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class create
 
 // -----------------------------------------------------------------------------
@@ -156,12 +153,12 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(createBF);
+    CPPUNIT_TEST_SUITE(createBF);
     CPPUNIT_TEST(createBF_001);
     CPPUNIT_TEST(createBF_002);
     CPPUNIT_TEST(createBF_003);
     CPPUNIT_TEST(createBF_004);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class createBF
 // -----------------------------------------------------------------------------
 class decode : public CppUnit::TestFixture
@@ -297,10 +294,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(decode);
+    CPPUNIT_TEST_SUITE(decode);
     CPPUNIT_TEST(decode_001);
     CPPUNIT_TEST(decode_002);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class decode
 // -----------------------------------------------------------------------------
 class decodeBF : public CppUnit::TestFixture
@@ -322,9 +319,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(decodeBF);
+    CPPUNIT_TEST_SUITE(decodeBF);
     CPPUNIT_TEST(decodeBF_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class decodeBF
 // -----------------------------------------------------------------------------
 class destroy : public CppUnit::TestFixture
@@ -349,9 +346,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(destroy);
+    CPPUNIT_TEST_SUITE(destroy);
     CPPUNIT_TEST(destroy_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class destroy
 // -----------------------------------------------------------------------------
 class destroyBF : public CppUnit::TestFixture
@@ -378,9 +375,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(destroyBF);
+    CPPUNIT_TEST_SUITE(destroyBF);
     CPPUNIT_TEST(destroyBF_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class destroyBF
 // -----------------------------------------------------------------------------
 class encode : public CppUnit::TestFixture
@@ -451,9 +448,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(encode);
+    CPPUNIT_TEST_SUITE(encode);
     CPPUNIT_TEST(encode_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class encode
 // -----------------------------------------------------------------------------
 class encodeBF : public CppUnit::TestFixture
@@ -475,9 +472,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(encodeBF);
+    CPPUNIT_TEST_SUITE(encodeBF);
     CPPUNIT_TEST(encodeBF_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class encodeBF
 // -----------------------------------------------------------------------------
 class init : public CppUnit::TestFixture
@@ -585,12 +582,12 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(init);
+    CPPUNIT_TEST_SUITE(init);
     CPPUNIT_TEST(init_001);
     CPPUNIT_TEST(init_002);
     CPPUNIT_TEST(init_003);
     CPPUNIT_TEST(init_004);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class init
 // -----------------------------------------------------------------------------
 class initBF : public CppUnit::TestFixture
@@ -614,9 +611,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    SAL_CPPUNIT_TEST_SUITE(initBF);
+    CPPUNIT_TEST_SUITE(initBF);
     CPPUNIT_TEST(initBF_001);
-    SAL_CPPUNIT_TEST_SUITE_END();
+    CPPUNIT_TEST_SUITE_END();
 }; // class initBF
 
 // -----------------------------------------------------------------------------