Update from master repository (DEV300_m95).

20 files changed, 148 insertions, 1578 deletions

diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index d46168dc4d0e..e0c1a81d66e3 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -33,8 +33,6 @@ PRJ=..$/..
 
 PRJNAME=sal
 TARGET=qa_ostringbuffer
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 01a620e8a238..e6a42793b15d 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -14789,11 +14789,7 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
             OString                expVal( kTestStr116 );
-#if defined(UNX) || defined(OS2)
-            sal_Int64              input = 9223372036854775807LL;
-#else
-            sal_Int64              input = 9223372036854775807;
-#endif
+            sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
 
             CPPUNIT_ASSERT_MESSAGE
@@ -14873,11 +14869,7 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
             OString                expVal( kTestStr118 );
-#if defined(UNX) || defined(OS2)
-            sal_Int64              input = 9223372036854775807LL;
-#else
-            sal_Int64              input = 9223372036854775807;
-#endif
+            sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
 
             CPPUNIT_ASSERT_MESSAGE
@@ -14956,11 +14948,7 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
             OString                expVal( kTestStr118 );
-#if defined(UNX) || defined(OS2)
-            sal_Int64              input = 9223372036854775807LL;
-#else
-            sal_Int64              input = 9223372036854775807;
-#endif
+            sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
 
             CPPUNIT_ASSERT_MESSAGE
@@ -15039,11 +15027,7 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
             OString                expVal( kTestStr118 );
-#if defined(UNX) || defined(OS2)
-            sal_Int64              input = 9223372036854775807LL;
-#else
-            sal_Int64              input = 9223372036854775807;
-#endif
+            sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
 
             CPPUNIT_ASSERT_MESSAGE
@@ -15122,11 +15106,7 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
             OString                expVal( kTestStr120 );
-#if defined(UNX) || defined(OS2)
-            sal_Int64              input = 9223372036854775807LL;
-#else
-            sal_Int64              input = 9223372036854775807;
-#endif
+            sal_Int64              input = SAL_CONST_INT64(9223372036854775807);
             aStrBuf.append( input );
 
             CPPUNIT_ASSERT_MESSAGE
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index fb0f9409dded..fbddc8f10d97 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -357,11 +357,7 @@ static const sal_Int16 kSInt16Max = SHRT_MAX;
 static const sal_Int32 kUInt16Max = USHRT_MAX;
 static const sal_Int32 kSInt32Max = INT_MAX;
 static const sal_Int64 kUInt32Max = UINT_MAX;
-#if defined(UNX) || defined(OS2)
-static const sal_Int64 kSInt64Max = 9223372036854775807LL;
-#else
-static const sal_Int64 kSInt64Max = 9223372036854775807;
-#endif
+static const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807);
 
 //------------------------------------------------------------------------
 
diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk
index 6350cdba0233..85452eac8655 100644
--- a/sal/qa/osl/pipe/makefile.mk
+++ b/sal/qa/osl/pipe/makefile.mk
@@ -51,7 +51,7 @@ SHL1OBJS=  \
     $(SLO)$/osl_Pipe.obj
 
 SHL1TARGET= osl_Pipe
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 6371ad3b5250..ffb9f314a5bf 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -36,6 +36,7 @@
 #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>
 
@@ -186,8 +187,8 @@ namespace osl_Pipe
         void ctors_name_option( )
             {
                 /// create a named pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
-                ::osl::Pipe aAssignPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                ::osl::Pipe aAssignPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
 
                 bRes = aPipe.is( ) && aAssignPipe.is( );
 
@@ -199,7 +200,7 @@ namespace osl_Pipe
             {
                 /// create a security pipe.
                 const ::osl::Security rSecurity;
-                ::osl::Pipe aSecurityPipe( aTestPipeName, osl_Pipe_CREATE, rSecurity );
+                ::osl::Pipe aSecurityPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSecurity );
 
                 bRes = aSecurityPipe.is( );
 
@@ -210,7 +211,7 @@ namespace osl_Pipe
         void ctors_copy( )
             {
                 /// create a pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// create a pipe using copy constructor.
                 ::osl::Pipe aCopyPipe( aPipe );
 
@@ -233,7 +234,7 @@ namespace osl_Pipe
         void ctors_no_acquire( )
             {
                 /// create a pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// constructs a pipe reference without acquiring the handle.
                 ::osl::Pipe aNoAcquirePipe( aPipe.getHandle( ), SAL_NO_ACQUIRE );
 
@@ -249,7 +250,7 @@ namespace osl_Pipe
         void ctors_acquire( )
             {
                 /// create a base pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// constructs two pipes without acquiring the handle on the base pipe.
                 ::osl::Pipe aAcquirePipe( aPipe.getHandle( ) );
                 ::osl::Pipe aAcquirePipe1( NULL );
@@ -287,14 +288,14 @@ namespace osl_Pipe
 
         void is_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), a normal pipe creation.", sal_True == aPipe.is( ) );
             }
 
         void is_003( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid case.", sal_False == aPipe.is( ) );
@@ -337,8 +338,8 @@ namespace osl_Pipe
             {
                 const Security rSec;
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
-                bRes1 = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
+                bRes1 = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.",
@@ -349,8 +350,8 @@ namespace osl_Pipe
             {
                 const Security rSec;
                 ::osl::Pipe aPipe, aPipe1;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
-                bRes1 = aPipe1.create( aTestPipeName, osl_Pipe_OPEN, rSec );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
+                bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN, rSec );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.",
@@ -360,8 +361,8 @@ namespace osl_Pipe
         void create_named_001( )
             {
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
-                bRes1 = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                bRes1 = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.",
@@ -371,8 +372,8 @@ namespace osl_Pipe
         void create_named_002( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
-                bRes1 = aPipe1.create( aTestPipeName, osl_Pipe_OPEN );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.",
@@ -382,7 +383,7 @@ namespace osl_Pipe
         void create_named_003( )
             {
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName) );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test default option is open.",
@@ -410,7 +411,7 @@ namespace osl_Pipe
         void clear_001( )
             {
                 ::osl::Pipe aPipe;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
                 bRes = aPipe.is( );
 
@@ -436,7 +437,7 @@ namespace osl_Pipe
         void assign_ref( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe1 = aPipe;
                 bRes = aPipe1.is( );
                 bRes1 = aPipe == aPipe1;
@@ -450,7 +451,7 @@ namespace osl_Pipe
         void assign_handle( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe1 = aPipe.getHandle( );
                 bRes = aPipe1.is( );
                 bRes1 = aPipe == aPipe1;
@@ -500,7 +501,7 @@ namespace osl_Pipe
         void isEqual_001( )
             {
                 ::osl::Pipe aPipe;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 bRes  = aPipe == aPipe;
                 aPipe.close( );
 
@@ -511,10 +512,10 @@ namespace osl_Pipe
         void isEqual_002( )
             {
                 ::osl::Pipe aPipe, aPipe1, aPipe2;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 aPipe1 = aPipe;
-                aPipe2.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe2.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 bRes  = aPipe == aPipe1;
                 bRes1 = aPipe == aPipe2;
@@ -543,7 +544,7 @@ namespace osl_Pipe
 
         void close_001( )
             {
-                ::osl::Pipe aPipe( aTestPipe1, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipe1), osl_Pipe_CREATE );
                 aPipe.close( );
                 bRes = aPipe.is( );
 
@@ -556,7 +557,7 @@ namespace osl_Pipe
 
         void close_002( )
             {
-                ::osl::StreamPipe aPipe( aTestPipe1, osl_Pipe_CREATE );
+                ::osl::StreamPipe aPipe( test::uniquePipeName(aTestPipe1), osl_Pipe_CREATE );
                 aPipe.close( );
                 int nRet = aPipe.send( m_pTestString1.getStr(), 3 );
 
@@ -624,7 +625,7 @@ namespace osl_Pipe
 
         void getError_001( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 oslPipeError nError = aPipe.getError( );
                 printPipeError( aPipe );
                 aPipe.clear( );
@@ -635,8 +636,8 @@ namespace osl_Pipe
 
         void getError_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
-                ::osl::Pipe aPipe1( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                ::osl::Pipe aPipe1( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 oslPipeError nError = aPipe.getError( );
                 printPipeError( aPipe );
                 aPipe.clear( );
@@ -663,7 +664,7 @@ namespace osl_Pipe
 
         void getHandle_001( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 bRes = aPipe == aPipe.getHandle( );
                 aPipe.clear( );
 
@@ -673,7 +674,7 @@ namespace osl_Pipe
 
         void getHandle_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 ::osl::Pipe aPipe1( aPipe.getHandle( ) );
                 bRes = aPipe == aPipe1;
                 aPipe.clear( );
@@ -726,7 +727,7 @@ namespace osl_StreamPipe
         void ctors_none( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
                 ::osl::StreamPipe aStreamPipe1;
                 bRes  = aStreamPipe1.is( );
@@ -744,7 +745,7 @@ namespace osl_StreamPipe
         void ctors_handle( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create a pipe with last handle.
                 ::osl::StreamPipe aStreamPipe1( aStreamPipe.getHandle( ) );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe == aStreamPipe1;
@@ -758,7 +759,7 @@ namespace osl_StreamPipe
         void ctors_copy( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
                 ::osl::StreamPipe aStreamPipe1( aStreamPipe );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe == aStreamPipe1;
@@ -772,9 +773,9 @@ namespace osl_StreamPipe
         void ctors_name_option( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
-                ::osl::StreamPipe aStreamPipe1( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::StreamPipe aStreamPipe1( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe.is( );
                 aStreamPipe.clear( );
                 aStreamPipe1.clear( );
@@ -787,7 +788,7 @@ namespace osl_StreamPipe
             {
                 /// create a security pipe.
                 const ::osl::Security rSecurity;
-                ::osl::StreamPipe aSecurityPipe( aTestPipeName, osl_Pipe_CREATE, rSecurity );
+                ::osl::StreamPipe aSecurityPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSecurity );
 
                 bRes = aSecurityPipe.is( );
                 aSecurityPipe.clear( );
@@ -809,7 +810,7 @@ namespace osl_StreamPipe
         void ctors_no_acquire( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // constructs a pipe reference without acquiring the handle.
                 ::osl::StreamPipe aNoAcquirePipe( aPipe.getHandle( ), SAL_NO_ACQUIRE );
 
@@ -846,7 +847,7 @@ namespace osl_StreamPipe
        void assign_ref( )
        {
        ::osl::StreamPipe aPipe, aPipe1;
-       aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+       aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
        aPipe1 = aPipe;
        bRes = aPipe1.is( );
        bRes1 = aPipe == aPipe1;
@@ -859,7 +860,7 @@ namespace osl_StreamPipe
 
        void assign_handle( )
        {
-       ::osl::StreamPipe * pPipe = new ::osl::StreamPipe( aTestPipeName, osl_Pipe_CREATE );
+       ::osl::StreamPipe * pPipe = new ::osl::StreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
        ::osl::StreamPipe * pAssignPipe = new ::osl::StreamPipe;
        *pAssignPipe = pPipe->getHandle( );
 
@@ -914,7 +915,7 @@ namespace osl_StreamPipe
                 sal_Int32 nChars = 0;
 
                 printf("open pipe\n");
-                ::osl::StreamPipe aSenderPipe( aTestPipeName, osl_Pipe_OPEN );  // aTestPipeName is a string = "TestPipe"
+                ::osl::StreamPipe aSenderPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );  // test::uniquePipeName(aTestPipeName) is a string = "TestPipe"
                 if ( aSenderPipe.is() == sal_False )
                 {
                     printf("pipe open failed! \n");
@@ -947,13 +948,13 @@ namespace osl_StreamPipe
     {
     public:
         sal_Char buf[256];
-        //::osl::StreamPipe aListenPipe;  //( aTestPipeName, osl_Pipe_CREATE );
+        //::osl::StreamPipe aListenPipe;  //( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
         ::osl::Pipe aListenPipe;
         ::osl::StreamPipe aConnectionPipe;
         Pipe_DataSource_Thread( )
             {
                 printf("create pipe\n");
-                aListenPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aListenPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
             }
         ~Pipe_DataSource_Thread( )
             {
@@ -964,7 +965,7 @@ namespace osl_StreamPipe
             {
                 //create pipe.
                 sal_Int32 nChars;
-                //::osl::StreamPipe aListenPipe( aTestPipeName, osl_Pipe_CREATE );
+                //::osl::StreamPipe aListenPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 printf("listen\n");
                 if ( aListenPipe.is() == sal_False )
                 {
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index 6bbee03b6aaf..e113ac86edee 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_osl_process
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index a95db211c2a6..67ad60057c07 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -33,7 +33,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_osl_profile
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 37ae3718b40d..db4f01eb439b 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_alloc
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 6bd3bd89d5a6..704c149d45cd 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_crc32
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index 415183b7e9a0..7798004ed854 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -29,8 +29,6 @@ INCPRE+= $(PRJ)$/qa$/inc
 
 PRJNAME=sal
 TARGET=rtl_digest
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index b13ccf420c06..45259fd3cba0 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_doublelock
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 329769b5d3ec..d6c9c6b674a3 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_locale
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl/math/export.exp b/sal/qa/rtl/math/export.exp
deleted file mode 100644
index a13529da5876..000000000000
--- a/sal/qa/rtl/math/export.exp
+++ /dev/null
@@ -1 +0,0 @@
-registerAllTestFunction
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index 3b35e52ab1f4..59f2ecc495bb 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -23,75 +23,33 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
-PRJ=..$/..$/..
-INCPRE+= $(PRJ)$/qa$/inc
+#***********************************************************************/
 
-PRJNAME=sal
-TARGET=rtl_math
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-ENABLE_EXCEPTIONS=TRUE
+PRJ = ../../..
+PRJNAME = sal
+TARGET = qa_rtl_profile
 
-# --- Settings -----------------------------------------------------
+ENABLE_EXCEPTIONS = TRUE
 
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+.INCLUDE: settings.mk
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#----------------------------------- OStringBuffer -----------------------------------
-
-SHL1OBJS= \
-    $(SLO)$/test_rtl_math.obj
-
-SHL1TARGET= rtl_math
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-
-# --- BEGIN --------------------------------------------------------
-SHL2OBJS=  \
-    $(SLO)$/rtl_math.obj
-SHL2TARGET= rtl_math2
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME=    $(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-
-
-
-# # --- BEGIN --------------------------------------------------------
-# LLA: this is an old test, which seems not to work
-# sal_setInt64()
-# sal_getInt64()
-# does not exist.
-#
-# SHL3OBJS=  \
-# 	$(SLO)$/rtl_old_testint64.obj
-# SHL3TARGET= rtl_old_testint64
-# SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-#
-# SHL3IMPLIB= i$(SHL3TARGET)
-# DEF3NAME=    $(SHL3TARGET)
-# SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
-#
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SHL1IMPLIB = i$(SHL1TARGET)
+SHL1OBJS = $(SLO)/test-rtl-math.obj
+SHL1RPATH = NONE
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+SHL1TARGET = test-rtl-math
+SHL1VERSIONMAP = $(PRJ)/qa/export.map
+DEF1NAME = $(SHL1TARGET)
 
-# --- Targets ------------------------------------------------------
+SLOFILES = $(SHL1OBJS)
 
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE: target.mk
+.INCLUDE: _cppunit.mk
 
+.END
diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx
deleted file mode 100644
index 653106ce0e30..000000000000
--- a/sal/qa/rtl/math/rtl_math.cxx
+++ /dev/null
@@ -1,626 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-#ifdef WIN32
-// LLA: take a look into Microsofts math.h implementation, why this define is need
-#define _USE_MATH_DEFINES
-#endif
-
-#include <math.h>
-#include <testshl/simpleheader.hxx>
-#include <rtl/math.h>
-#include <rtl/string.hxx>
-
-#include "valueequal.hxx"
-
-namespace rtl_math
-{
-
-class test : public CppUnit::TestFixture
-{
-public:
-    // initialise your test code values here.
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-
-    void equalCheck(double _nResult, double _nExpect) /* throws Exception */
-        {
-            bool bEqualResult = is_double_equal(_nResult, _nExpect);
-
-            rtl::OString sError = "rtl_math_round expected result is wrong should:(";
-            sError += rtl::OString::valueOf(_nExpect);
-            sError += ") but is:(";
-            sError += rtl::OString::valueOf(_nResult);
-            sError += ")";
-
-            CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bEqualResult == true);
-        }
-
-    // insert your test code here.
-    void round_000()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nValue = M_PI;
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(nValue, 0, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(3.0));
-
-        nResult = rtl_math_round(nValue, 2, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(3.14));
-
-        nResult = rtl_math_round(nValue, 3, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(3.142));
-
-        nResult = rtl_math_round(nValue, 10, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(3.1415926536));
-    }
-
-    // insert your test code here.
-    void round_001_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(0.2));
-    }
-
-    void round_001_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Corrected);
-        equalCheck(nResult, double(-0.2));
-    }
-// -----------------------------------------------------------------------------
-    void round_002_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(0.1));
-    }
-
-    void round_002_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Down);
-        equalCheck(nResult, double(-0.1));
-    }
-// -----------------------------------------------------------------------------
-    void round_003_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(0.2));
-    }
-
-    void round_003_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Up);
-        equalCheck(nResult, double(-0.2));
-    }
-// -----------------------------------------------------------------------------
-    void round_004_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(0.1));
-    }
-
-    void round_004_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Floor);
-        equalCheck(nResult, double(-0.2));
-    }
-// -----------------------------------------------------------------------------
-    void round_005_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(0.2));
-    }
-
-    void round_005_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_Ceiling);
-        equalCheck(nResult, double(-0.1));
-    }
-// -----------------------------------------------------------------------------
-    void round_006_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(0.2));
-    }
-
-    void round_006_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfDown);
-        equalCheck(nResult, double(-0.2));
-    }
-// -----------------------------------------------------------------------------
-    void round_007_positiv()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(0.1, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.11, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.13, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.14, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.1499999, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.1));
-
-        nResult = rtl_math_round(0.15, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.151, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.16, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.2));
-
-        nResult = rtl_math_round(0.199999999, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(0.2));
-    }
-
-    void round_007_negativ()
-    {
-        // this is demonstration code
-        // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-        double nResult = 0.0;
-
-        nResult = rtl_math_round(-0.1, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.11, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.13, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.14, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.1499999, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.1));
-
-        nResult = rtl_math_round(-0.15, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.151, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.16, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.2));
-
-        nResult = rtl_math_round(-0.19999999999, 1, rtl_math_RoundingMode_HalfUp);
-        equalCheck(nResult, double(-0.2));
-    }
-
-    // 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.
-
-    CPPUNIT_TEST_SUITE(test);
-    CPPUNIT_TEST(round_000);
-
-    CPPUNIT_TEST(round_001_positiv);
-    CPPUNIT_TEST(round_001_negativ);
-
-    CPPUNIT_TEST(round_002_positiv);
-    CPPUNIT_TEST(round_002_negativ);
-
-    CPPUNIT_TEST(round_003_positiv);
-    CPPUNIT_TEST(round_003_negativ);
-
-    CPPUNIT_TEST(round_004_positiv);
-    CPPUNIT_TEST(round_004_negativ);
-
-    CPPUNIT_TEST(round_005_positiv);
-    CPPUNIT_TEST(round_005_negativ);
-
-    CPPUNIT_TEST(round_006_positiv);
-    CPPUNIT_TEST(round_006_negativ);
-
-    CPPUNIT_TEST(round_007_positiv);
-    CPPUNIT_TEST(round_007_negativ);
-
-    CPPUNIT_TEST_SUITE_END();
-}; // class test
-
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_math::test, "rtl_math");
-} // namespace rtl_math
-
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
diff --git a/sal/qa/rtl/math/rtl_old_testint64.cxx b/sal/qa/rtl/math/rtl_old_testint64.cxx
deleted file mode 100644
index e1f30ac03be6..000000000000
--- a/sal/qa/rtl/math/rtl_old_testint64.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-// LLA:
-// this file is converted to use with testshl2
-// original was placed in sal/test/textenc.cxx
-
-// fndef    _OSL_DIAGNOSE_H_
-// nclude <osl/diagnose.h>
-// #endif
-
-#include <sal/types.h>
-
-#define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-
-// #if OSL_DEBUG_LEVEL > 0
-// #define TEST_ENSURE(c, m)   OSL_ENSURE(c, m)
-// #else
-// #define TEST_ENSURE(c, m)   OSL_VERIFY(c)
-// #endif
-
-#include <testshl/simpleheader.hxx>
-
-// -----------------------------------------------------------------------------
-namespace rtl_math
-{
-    class int64 : public CppUnit::TestFixture
-    {
-    public:
-        void test_int64();
-
-        CPPUNIT_TEST_SUITE( int64 );
-        CPPUNIT_TEST( test_int64 );
-        CPPUNIT_TEST_SUITE_END( );
-    };
-
-void int64::test_int64()
-{
-#ifndef SAL_INT64_IS_STRUCT
-#ifdef UNX
-    sal_Int64 i1 = -3223372036854775807LL;
-    sal_uInt64 u1 = 5223372036854775807ULL;
-#else
-    sal_Int64 i1 = -3223372036854775807;
-    sal_uInt64 u1 = 5223372036854775807;
-#endif
-    sal_Int64 i2 = 0;
-    sal_uInt64 u2 = 0;
-#else
-    sal_Int64 i1;
-    sal_setInt64(&i1, 3965190145L, -750499787L);
-
-    sal_Int64 i2 = { 0, 0 };
-
-    sal_uInt64 u1;
-    sal_setUInt64(&u1, 1651507199UL, 1216161073UL);
-
-    sal_uInt64 u2 = {0, 0 };
-
-#endif
-    sal_uInt32 low = 0;
-    sal_Int32 high = 0;
-
-    sal_getInt64(i1, &low, &high);
-    sal_setInt64(&i2, low, high);
-
-    sal_uInt32 ulow = 0;
-    sal_uInt32 uhigh = 0;
-
-    sal_getUInt64(u1, &ulow, &uhigh);
-    sal_setUInt64(&u2, ulow, uhigh);
-
-#ifndef SAL_INT64_IS_STRUCT
-    TEST_ENSURE( i1 == i2, "test_int64 error 1");
-
-    TEST_ENSURE( u1 == u2, "test_int64 error 2");
-#else
-    TEST_ENSURE( (i1.Part1 == i2.Part1) && (i1.Part2 == i2.Part2),
-                  "test_int64 error 1");
-
-    TEST_ENSURE( (u1.Part1 == u2.Part1) && (u1.Part2 == u2.Part2),
-                  "test_int64 error 2");
-#endif
-    return;
-}
-
-} // namespace rtl_math
-
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_math::int64, "rtl_math" );
-
-// -----------------------------------------------------------------------------
-NOADDITIONAL;
-
-
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
new file mode 100644
index 000000000000..8e9875444280
--- /dev/null
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.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"
+#include "sal/types.h"
+
+namespace {
+
+class Test: public CppUnit::TestFixture {
+public:
+    void test_stringToDouble_good() {
+        rtl_math_ConversionStatus status;
+        sal_Int32 end;
+        double res = rtl::math::stringToDouble(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("  +1.E01foo")),
+            sal_Unicode('.'), sal_Unicode(','), &status, &end);
+        CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH("  +1.E01")), end);
+        CPPUNIT_ASSERT_EQUAL(10.0, res);
+    }
+
+    void test_stringToDouble_bad() {
+        rtl_math_ConversionStatus status;
+        sal_Int32 end;
+        double res = rtl::math::stringToDouble(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("  +Efoo")),
+            sal_Unicode('.'), sal_Unicode(','), &status, &end);
+        CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
+        CPPUNIT_ASSERT_EQUAL(0.0, res);
+    }
+
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(test_stringToDouble_good);
+    CPPUNIT_TEST(test_stringToDouble_bad);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx
deleted file mode 100644
index 887e3ddd1214..000000000000
--- a/sal/qa/rtl/math/test_rtl_math.cxx
+++ /dev/null
@@ -1,674 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
-
-#include "rtl/math.h"
-#include "rtl/math.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/textenc.h"
-// #include "rtl/tres.h"
-#include <testshl/tresstatewrapper.hxx>
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-
-#include <stdlib.h>
-
-namespace {
-
-struct FloatTraits
-{
-    typedef float Number;
-
-    static inline char const * getPrefix() { return "float"; }
-};
-
-struct DoubleTraits
-{
-    typedef double Number;
-
-    static inline char const * getPrefix() { return "double"; }
-};
-
-struct StringTraits
-{
-    typedef rtl::OString String;
-
-    static inline char const * getPrefix() { return "OString"; }
-
-    static inline rtl::OString createFromAscii(char const * pString)
-    { return rtl::OString(pString); }
-
-    static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
-                                    rtl::OString const & rString)
-    { rBuffer.append(rString); }
-
-    static inline rtl::OString doubleToString(double fValue,
-                                              rtl_math_StringFormat eFormat,
-                                              sal_Int32 nDecPlaces,
-                                              sal_Char cDecSeparator,
-                                              bool bEraseTrailingDecZeros)
-    {
-        return rtl::math::doubleToString(fValue, eFormat, nDecPlaces,
-                                         cDecSeparator, bEraseTrailingDecZeros);
-    }
-};
-
-struct UStringTraits
-{
-    typedef rtl::OUString String;
-
-    static inline char const * getPrefix() { return "OUString"; }
-
-    static inline rtl::OUString createFromAscii(char const * pString)
-    { return rtl::OUString::createFromAscii(pString); }
-
-    static inline void appendBuffer(rtl::OStringBuffer & rBuffer,
-                                    rtl::OUString const & rString)
-    { rBuffer.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); }
-
-    static inline rtl::OUString doubleToString(double fValue,
-                                               rtl_math_StringFormat eFormat,
-                                               sal_Int32 nDecPlaces,
-                                               sal_Unicode cDecSeparator,
-                                               bool bEraseTrailingDecZeros)
-        {
-        return rtl::math::doubleToUString(fValue, eFormat, nDecPlaces,
-                                          cDecSeparator,
-                                          bEraseTrailingDecZeros);
-    }
-};
-
-struct TestNumberToString
-{
-    double fValue;
-    rtl_math_StringFormat eFormat;
-    sal_Int32 nDecPlaces;
-    char cDecSeparator;
-    bool bEraseTrailingDecZeros;
-    char const * pResult;
-};
-
-template< typename StringT, typename NumberT >
-bool testNumberToString(hTestResult pTestResult,
-                        TestNumberToString const & rTest)
-{
-    typename NumberT::Number fValue = static_cast< typename NumberT::Number >(rTest.fValue);
-    if (fValue != rTest.fValue)
-        return true;
-
-    // LLA: t_print("size: %d ", sizeof(fValue));
-    typename StringT::String aResult1;
-
-    aResult1 = StringT::doubleToString(fValue, rTest.eFormat, rTest.nDecPlaces,
-                                       rTest.cDecSeparator,
-                                       rTest.bEraseTrailingDecZeros);
-
-    typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
-
-    // LLA: rtl::OStringBuffer aBuf;
-    // LLA: StringT::appendBuffer(aBuf, aResult1);
-    // LLA: t_print("aResult1: %s  ", aBuf.getStr());
-    // LLA:
-    // LLA: rtl::OStringBuffer aBuf2;
-    // LLA: StringT::appendBuffer(aBuf2, aResult2);
-    // LLA: t_print("aResult2: %s\n", aBuf2.getStr());
-
-    bool bSuccess = aResult1 == aResult2;
-
-    rtl::OStringBuffer aBuffer;
-    aBuffer.append(StringT::getPrefix());
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("/"));
-    aBuffer.append(NumberT::getPrefix());
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" doubleToString("));
-    aBuffer.append(fValue);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(rTest.nDecPlaces);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(rTest.cDecSeparator);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
-    StringT::appendBuffer(aBuffer, aResult1);
-    if (!bSuccess)
-    {
-        aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
-        StringT::appendBuffer(aBuffer, aResult2);
-    }
-    // call to the real test checker
-    // pTestResult->pFuncs->state_(pTestResult, bSuccess, "test_rtl_math",
-    //                             aBuffer.getStr(), false);
-    c_rtl_tres_state(pTestResult, bSuccess, aBuffer.getStr(), "testNumberToString");
-    return bSuccess;
-}
-
-template< typename StringT, typename NumberT >
-bool testNumberToString(hTestResult pTestResult,
-                        TestNumberToString const * pTests, size_t nCount)
-{
-    bool bSuccess = true;
-    for (size_t i = 0; i < nCount; ++i)
-        bSuccess &= testNumberToString< StringT, NumberT >(pTestResult,
-                                                           pTests[i]);
-    return bSuccess;
-}
-
-struct TestStringToNumberToString
-{
-    char const * pValue;
-    rtl_math_StringFormat eFormat;
-    sal_Int32 nDecPlaces;
-    char cDecSeparator;
-    bool bEraseTrailingDecZeros;
-    char const * pResult;
-};
-
-template< typename StringT >
-bool testStringToNumberToString(hTestResult pTestResult,
-                                TestStringToNumberToString const & rTest)
-{
-    double d = rtl::math::stringToDouble(StringT::createFromAscii(rTest.pValue),
-                                         rTest.cDecSeparator, 0, 0, 0);
-    typename StringT::String aResult1(
-        StringT::doubleToString(d, rTest.eFormat, rTest.nDecPlaces,
-                                rTest.cDecSeparator,
-                                rTest.bEraseTrailingDecZeros));
-    typename StringT::String aResult2(StringT::createFromAscii(rTest.pResult));
-    bool bSuccess = aResult1 == aResult2;
-    rtl::OStringBuffer aBuffer;
-    aBuffer.append(StringT::getPrefix());
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(
-                       " doubleToString(stringToDouble("));
-    aBuffer.append(rTest.pValue);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(rTest.cDecSeparator);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("), "));
-    aBuffer.append(static_cast< sal_Int32 >(rTest.eFormat));
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(rTest.nDecPlaces);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(rTest.cDecSeparator);
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM(", "));
-    aBuffer.append(static_cast< sal_Int32 >(rTest.bEraseTrailingDecZeros));
-    aBuffer.append(RTL_CONSTASCII_STRINGPARAM("): "));
-    StringT::appendBuffer(aBuffer, aResult1);
-    if (!bSuccess)
-    {
-        aBuffer.append(RTL_CONSTASCII_STRINGPARAM(" != "));
-        StringT::appendBuffer(aBuffer, aResult2);
-    }
-    // call to the real test checker
-    // pTestResult->pFuncs->state_(pTestResult, bSuccess, "test_rtl_math",
-    //                             aBuffer.getStr(), false);
-    c_rtl_tres_state(pTestResult, bSuccess, aBuffer.getStr(), "testStringToNumberToString");
-
-    return bSuccess;
-}
-
-template< typename StringT >
-bool testStringToNumberToString(hTestResult pTestResult,
-                                TestStringToNumberToString const * pTests,
-                                size_t nCount)
-{
-    bool bSuccess = true;
-    for (size_t i = 0; i < nCount; ++i)
-        bSuccess &= testStringToNumberToString< StringT >(pTestResult,
-                                                          pTests[i]);
-    return bSuccess;
-}
-
-}
-
-extern "C" sal_Bool SAL_CALL test_rtl_math(hTestResult pTestResult)
-{
-    bool bReturn = true;
-
-    {
-        static TestNumberToString const aTest[]
-            = { // 1, 1+2^-1, ..., 1+2^-52
-                // Too few decimal digits are printed, so that various different
-                // double values lead to the same output:
-                { 1, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { 1.5, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.5" },
-                { 1.25, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.25" },
-                { 1.125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.125" },
-                { 1.0625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.0625" },
-                { 1.03125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.03125" },
-                { 1.015625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.015625" },
-                { 1.0078125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.0078125" },
-                { 1.00390625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00390625" },
-                { 1.001953125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.001953125" },
-                { 1.0009765625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.0009765625" },
-                { 1.00048828125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00048828125" },
-                { 1.000244140625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.000244140625" },
-                { 1.0001220703125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.0001220703125" },
-                { 1.00006103515625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00006103515625" },
-                { 1.000030517578125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00003051757813" },
-                { 1.0000152587890625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00001525878906" },
-                { 1.00000762939453125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000762939453" },
-                { 1.000003814697265625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000381469727" },
-                { 1.0000019073486328125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000190734863" },
-                { 1.00000095367431640625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000095367432" },
-                { 1.000000476837158203125, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000047683716" },
-                { 1.0000002384185791015625, rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1.00000023841858" },
-                { 1.00000011920928955078125, rtl_math_StringFormat_Automatic,
-                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000011920929" },
-                { 1.000000059604644775390625, rtl_math_StringFormat_Automatic,
-                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000005960464" },
-                { 1.0000000298023223876953125, rtl_math_StringFormat_Automatic,
-                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000002980232" },
-                { 1.00000001490116119384765625, rtl_math_StringFormat_Automatic,
-                  rtl_math_DecimalPlaces_Max, '.', true, "1.00000001490116" },
-                { 1.000000007450580596923828125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000745058" },
-                { 1.0000000037252902984619140625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000372529" },
-                { 1.00000000186264514923095703125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000186265" },
-                { 1.000000000931322574615478515625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000093132" },
-                { 1.0000000004656612873077392578125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000046566" },
-                { 1.00000000023283064365386962890625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000023283" },
-                { 1.000000000116415321826934814453125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000011642" },
-                { 1.0000000000582076609134674072265625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000005821" },
-                { 1.00000000002910383045673370361328125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.0000000000291" },
-                { 1.000000000014551915228366851806640625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000001455" },
-                { 1.0000000000072759576141834259033203125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000728" },
-                { 1.00000000000363797880709171295166015625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000364" },
-                { 1.000000000001818989403545856475830078125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000182" },
-                { 1.0000000000009094947017729282379150390625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000091" },
-                { 1.00000000000045474735088646411895751953125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000045" },
-                { 1.000000000000227373675443232059478759765625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000023" },
-                { 1.0000000000001136868377216160297393798828125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000011" },
-                { 1.00000000000005684341886080801486968994140625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000006" },
-                { 1.000000000000028421709430404007434844970703125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000003" },
-                { 1.0000000000000142108547152020037174224853515625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000001" },
-                { 1.00000000000000710542735760100185871124267578125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1.00000000000001" },
-                { 1.000000000000003552713678800500929355621337890625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1" },
-                { 1.0000000000000017763568394002504646778106689453125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1" },
-                { 1.00000000000000088817841970012523233890533447265625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1" },
-                { 1.000000000000000444089209850062616169452667236328125,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1" },
-                { 1.0000000000000002220446049250313080847263336181640625,
-                  rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                  '.', true, "1" },
-
-                // 1, 1+2^-1, ..., 1+2^-52
-                // Too few decimal digits are printed, so that various different
-                // double values lead to the same output:
-                { 1, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" },
-                { 1.5, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.50000000000000000000000000000000000000000000000000000" },
-                { 1.25, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.25000000000000000000000000000000000000000000000000000" },
-                { 1.125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.12500000000000000000000000000000000000000000000000000" },
-                { 1.0625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.06250000000000000000000000000000000000000000000000000" },
-                { 1.03125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.03125000000000000000000000000000000000000000000000000" },
-                { 1.015625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.01562500000000000000000000000000000000000000000000000" },
-                { 1.0078125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00781250000000000000000000000000000000000000000000000" },
-                { 1.00390625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00390625000000000000000000000000000000000000000000000" },
-                { 1.001953125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00195312500000000000000000000000000000000000000000000" },
-                { 1.0009765625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00097656250000000000000000000000000000000000000000000" },
-                { 1.00048828125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00048828125000000000000000000000000000000000000000000" },
-                { 1.000244140625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00024414062500000000000000000000000000000000000000000" },
-                { 1.0001220703125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00012207031250000000000000000000000000000000000000000" },
-                { 1.00006103515625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00006103515625000000000000000000000000000000000000000" },
-                { 1.000030517578125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00003051757813000000000000000000000000000000000000000" },
-                { 1.0000152587890625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00001525878906000000000000000000000000000000000000000" },
-                { 1.00000762939453125, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000762939453000000000000000000000000000000000000000" },
-                { 1.000003814697265625, rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000381469727000000000000000000000000000000000000000" },
-                { 1.0000019073486328125, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000190734863000000000000000000000000000000000000000" },
-                { 1.00000095367431640625, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000095367432000000000000000000000000000000000000000" },
-                { 1.000000476837158203125, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000047683716000000000000000000000000000000000000000" },
-                { 1.0000002384185791015625, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000023841858000000000000000000000000000000000000000" },
-                { 1.00000011920928955078125, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000011920929000000000000000000000000000000000000000" },
-                { 1.000000059604644775390625, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000005960464000000000000000000000000000000000000000" },
-                { 1.0000000298023223876953125, rtl_math_StringFormat_F, 53, '.',
-                  false,
-                  "1.00000002980232000000000000000000000000000000000000000" },
-                { 1.00000001490116119384765625, rtl_math_StringFormat_F, 53,
-                  '.', false,
-                  "1.00000001490116000000000000000000000000000000000000000" },
-                { 1.000000007450580596923828125, rtl_math_StringFormat_F, 53,
-                  '.', false,
-                  "1.00000000745058000000000000000000000000000000000000000" },
-                { 1.0000000037252902984619140625, rtl_math_StringFormat_F, 53,
-                  '.', false,
-                  "1.00000000372529000000000000000000000000000000000000000" },
-                { 1.00000000186264514923095703125, rtl_math_StringFormat_F, 53,
-                  '.', false,
-                  "1.00000000186265000000000000000000000000000000000000000" },
-                { 1.000000000931322574615478515625, rtl_math_StringFormat_F, 53,
-                  '.', false,
-                  "1.00000000093132000000000000000000000000000000000000000" },
-                { 1.0000000004656612873077392578125, rtl_math_StringFormat_F,
-                  53, '.', false,
-                  "1.00000000046566000000000000000000000000000000000000000" },
-                { 1.00000000023283064365386962890625, rtl_math_StringFormat_F,
-                  53, '.', false,
-                  "1.00000000023283000000000000000000000000000000000000000" },
-                { 1.000000000116415321826934814453125, rtl_math_StringFormat_F,
-                  53, '.', false,
-                  "1.00000000011642000000000000000000000000000000000000000" },
-                { 1.0000000000582076609134674072265625, rtl_math_StringFormat_F,
-                  53, '.', false,
-                  "1.00000000005821000000000000000000000000000000000000000" },
-                { 1.00000000002910383045673370361328125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000002910000000000000000000000000000000000000000" },
-                { 1.000000000014551915228366851806640625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000001455000000000000000000000000000000000000000" },
-                { 1.0000000000072759576141834259033203125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000728000000000000000000000000000000000000000" },
-                { 1.00000000000363797880709171295166015625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000364000000000000000000000000000000000000000" },
-                { 1.000000000001818989403545856475830078125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000182000000000000000000000000000000000000000" },
-                { 1.0000000000009094947017729282379150390625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000091000000000000000000000000000000000000000" },
-                { 1.00000000000045474735088646411895751953125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000045000000000000000000000000000000000000000" },
-                { 1.000000000000227373675443232059478759765625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000023000000000000000000000000000000000000000" },
-                { 1.0000000000001136868377216160297393798828125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000011000000000000000000000000000000000000000" },
-                { 1.00000000000005684341886080801486968994140625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000006000000000000000000000000000000000000000" },
-                { 1.000000000000028421709430404007434844970703125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000003000000000000000000000000000000000000000" },
-                { 1.0000000000000142108547152020037174224853515625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000001000000000000000000000000000000000000000" },
-                { 1.00000000000000710542735760100185871124267578125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000001000000000000000000000000000000000000000" },
-                { 1.000000000000003552713678800500929355621337890625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" },
-                { 1.0000000000000017763568394002504646778106689453125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" },
-                { 1.00000000000000088817841970012523233890533447265625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" },
-                { 1.000000000000000444089209850062616169452667236328125,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" },
-                { 1.0000000000000002220446049250313080847263336181640625,
-                  rtl_math_StringFormat_F, 53, '.', false,
-                  "1.00000000000000000000000000000000000000000000000000000" } };
-        size_t const nCount = sizeof aTest / sizeof aTest[0];
-
-//LLA: the float tests are wrong here, due to the fact that
-//     we calculate with too less digits after the point
-
-//        bReturn &= testNumberToString< StringTraits, FloatTraits >(
-//            pTestResult, aTest, nCount);
-        bReturn &= testNumberToString< StringTraits, DoubleTraits >(
-            pTestResult, aTest, nCount);
-//        bReturn &= testNumberToString< UStringTraits, FloatTraits >(
-//            pTestResult, aTest, nCount);
-        bReturn &= testNumberToString< UStringTraits, DoubleTraits >(
-            pTestResult, aTest, nCount);
-    }
-
-    {
-        static TestStringToNumberToString const aTest[]
-            = { { "1", rtl_math_StringFormat_Automatic,
-                rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { " 1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { "  1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { "\t1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { "\t 1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-                { " \t1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "1" },
-
-                { "-1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-                { " -1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-                { "  -1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-                { "\t-1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-                { "\t -1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-                { " \t-1", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', true, "-1" },
-
-                { "1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-                { " 1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-                { "  1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-                { "\t1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-                { "\t 1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-                { " \t1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#INF" },
-
-                { "-1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-                { " -1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-                { "  -1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-                { "\t-1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-                { "\t -1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-                { " \t-1.#INF", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#INF" },
-
-                { "1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-                { " 1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-                { "  1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-                { "\t1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-                { "\t 1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-                { " \t1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "1.#NAN" },
-
-                { "-1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-                { " -1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-                { "  -1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-                { "\t-1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-                { "\t -1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-                { " \t-1.#NAN", rtl_math_StringFormat_Automatic,
-                    rtl_math_DecimalPlaces_Max, '.', false, "-1.#NAN" },
-
-                { "3.14E-2000", rtl_math_StringFormat_E, 4, '.', false,
-                  "0.0000E+000" },
-                { "3.14E-200", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E-200" },
-                { "3.14E-20", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E-020" },
-                { "3.14E-2", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E-002" },
-                { "3.14E2", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E+002" },
-                { "3.14E20", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E+020" },
-                { "3.14E200", rtl_math_StringFormat_E, 4, '.', false,
-                  "3.1400E+200" },
-                { "3.14E2000", rtl_math_StringFormat_E, 4, '.', false,
-                  "1.#INF" },
-            };
-        size_t const nCount = sizeof aTest / sizeof aTest[0];
-        bReturn &= testStringToNumberToString< StringTraits >(
-            pTestResult, aTest, nCount);
-        bReturn &= testStringToNumberToString< UStringTraits >(
-            pTestResult, aTest, nCount);
-    }
-
-    return bReturn;
-}
-
-// -----------------------------------------------------------------------------
-extern "C" void /* sal_Bool */ SAL_CALL test_rtl_math2( hTestResult hRtlTestResult )
-{
-    c_rtl_tres_state_start(hRtlTestResult, "rtl_math" );
-
-    test_rtl_math( hRtlTestResult );
-
-    c_rtl_tres_state_end(hRtlTestResult, "rtl_math" );
-}
-// -----------------------------------------------------------------------------
-void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
-{
-    if (_pFunc)
-    {
-        (_pFunc)(&test_rtl_math2, "");
-    }
-}
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index cd57ec9bcc13..ef8616a90916 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_random
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk
index 387f0675ace8..708a41a87887 100644
--- a/sal/qa/rtl_strings/makefile.mk
+++ b/sal/qa/rtl_strings/makefile.mk
@@ -28,7 +28,6 @@ PRJ=..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_strings
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE