WaE: workaround auto_ptr deprecation

sal/qa/osl/module/osl_Module.cxx

@@ -212,10 +212,10 @@ namespace osl_Module
                                     sal_True == bRes  );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_none );
         CPPUNIT_TEST( ctors_name_mode );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -262,10 +262,10 @@ namespace osl_Module
 
         /* tester comments: another case is getFunctionSymbol_001*/
 
-        CPPUNIT_TEST_SUITE( getUrlFromAddress );
+        SAL_CPPUNIT_TEST_SUITE( getUrlFromAddress );
         CPPUNIT_TEST( getUrlFromAddress_001 );
         CPPUNIT_TEST( getUrlFromAddress_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUrlFromAddress
 
 
@@ -336,10 +336,10 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( load );
+        SAL_CPPUNIT_TEST_SUITE( load );
         CPPUNIT_TEST( load_001 );
         CPPUNIT_TEST( load_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class load
 
 
@@ -362,9 +362,9 @@ namespace osl_Module
                                     sal_True == bRes  );
         }
 
-        CPPUNIT_TEST_SUITE( unload );
+        SAL_CPPUNIT_TEST_SUITE( unload );
         CPPUNIT_TEST( unload_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class unload
 
 
@@ -394,9 +394,9 @@ namespace osl_Module
             CPPUNIT_ASSERT_MESSAGE( "#test comment#: test if a module is a loaded module.",
                                      sal_False == bRes && sal_True == bRes1);
         }
-        CPPUNIT_TEST_SUITE( is );
+        SAL_CPPUNIT_TEST_SUITE( is );
         CPPUNIT_TEST( is_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class is
 
 
@@ -424,9 +424,9 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getSymbol );
+        SAL_CPPUNIT_TEST_SUITE( getSymbol );
         CPPUNIT_TEST( getSymbol_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getSymbol
 
 
@@ -474,10 +474,10 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( optr_oslModule );
+        SAL_CPPUNIT_TEST_SUITE( optr_oslModule );
         CPPUNIT_TEST( optr_oslModule_001 );
         CPPUNIT_TEST( optr_oslModule_002 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class optr_oslModule
 
     /** testing the methods:
@@ -502,9 +502,9 @@ namespace osl_Module
 #endif
         }
 
-        CPPUNIT_TEST_SUITE( getFunctionSymbol );
+        SAL_CPPUNIT_TEST_SUITE( getFunctionSymbol );
         CPPUNIT_TEST( getFunctionSymbol_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getFunctionSymbol
 
 // -----------------------------------------------------------------------------

sal/qa/osl/process/osl_Thread.cxx

@@ -567,10 +567,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(create);
+        SAL_CPPUNIT_TEST_SUITE(create);
         CPPUNIT_TEST(create_001);
         CPPUNIT_TEST(create_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class create
 
 
@@ -633,11 +633,11 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(createSuspended);
+        SAL_CPPUNIT_TEST_SUITE(createSuspended);
         CPPUNIT_TEST(createSuspended_001);
         // LLA: Deadlocked!!!
         CPPUNIT_TEST(createSuspended_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class createSuspended
 
     /** when the count value equal to or more than 3, suspend the thread.
@@ -743,11 +743,11 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(suspend);
+        SAL_CPPUNIT_TEST_SUITE(suspend);
         CPPUNIT_TEST(suspend_001);
         // LLA: Deadlocked!!!
         // CPPUNIT_TEST(createSuspended_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class suspend
 
     /** Test of the osl::Thread::resume method
@@ -829,10 +829,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(resume);
+        SAL_CPPUNIT_TEST_SUITE(resume);
         CPPUNIT_TEST(resume_001);
         CPPUNIT_TEST(resume_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class resume
 
     /** Test of the osl::Thread::terminate method
@@ -908,10 +908,10 @@ namespace osl_Thread
                     nLaterValue > nValue );
             }
 
-        CPPUNIT_TEST_SUITE(terminate);
+        SAL_CPPUNIT_TEST_SUITE(terminate);
         CPPUNIT_TEST(terminate_001);
         CPPUNIT_TEST(terminate_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class terminate
 
     /** Test of the osl::Thread::join method
@@ -1000,10 +1000,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(join);
+        SAL_CPPUNIT_TEST_SUITE(join);
         CPPUNIT_TEST(join_001);
         CPPUNIT_TEST(join_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class join
 
     /** Test of the osl::Thread::isRunning method
@@ -1071,10 +1071,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(isRunning);
+        SAL_CPPUNIT_TEST_SUITE(isRunning);
         CPPUNIT_TEST(isRunning_001);
         CPPUNIT_TEST(isRunning_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class isRunning
 
 
@@ -1522,7 +1522,7 @@ namespace osl_Thread
             }
 
 
-        CPPUNIT_TEST_SUITE(setPriority);
+        SAL_CPPUNIT_TEST_SUITE(setPriority);
 #ifndef SOLARIS
         CPPUNIT_TEST(setPriority_002);
         CPPUNIT_TEST(setPriority_003);
@@ -1534,7 +1534,7 @@ namespace osl_Thread
         CPPUNIT_TEST(setPriority_001_3);
         CPPUNIT_TEST(setPriority_001_4);
         CPPUNIT_TEST(setPriority_001_5);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class setPriority
 
     /** Test of the osl::Thread::getPriority method
@@ -1587,10 +1587,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(getPriority);
+        SAL_CPPUNIT_TEST_SUITE(getPriority);
         CPPUNIT_TEST(getPriority_001);
         CPPUNIT_TEST(getPriority_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getPriority
 
 
@@ -1617,10 +1617,10 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(getIdentifier);
+        SAL_CPPUNIT_TEST_SUITE(getIdentifier);
         CPPUNIT_TEST(getIdentifier_001);
         CPPUNIT_TEST(getIdentifier_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getIdentifier
 
     /** Test of the osl::Thread::getCurrentIdentifier method
@@ -1660,10 +1660,10 @@ namespace osl_Thread
             {
             }
 
-        CPPUNIT_TEST_SUITE(getCurrentIdentifier);
+        SAL_CPPUNIT_TEST_SUITE(getCurrentIdentifier);
         CPPUNIT_TEST(getCurrentIdentifier_001);
         //CPPUNIT_TEST(getCurrentIdentifier_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getCurrentIdentifier
 
     /** Test of the osl::Thread::wait method
@@ -1727,9 +1727,9 @@ namespace osl_Thread
 
             }
 
-        CPPUNIT_TEST_SUITE(wait);
+        SAL_CPPUNIT_TEST_SUITE(wait);
         CPPUNIT_TEST(wait_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class wait
 
     /** osl::Thread::yield method: can not design good test scenario to test up to now
@@ -1751,9 +1751,9 @@ namespace osl_Thread
             }
 
 
-        CPPUNIT_TEST_SUITE(yield);
+        SAL_CPPUNIT_TEST_SUITE(yield);
         CPPUNIT_TEST(yield_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class yield
 
     /** Test of the osl::Thread::schedule method
@@ -1874,10 +1874,10 @@ namespace osl_Thread
                     );
             }
 
-        CPPUNIT_TEST_SUITE(schedule);
+        SAL_CPPUNIT_TEST_SUITE(schedule);
         CPPUNIT_TEST(schedule_001);
         CPPUNIT_TEST(schedule_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class schedule
 
 // -----------------------------------------------------------------------------
@@ -1994,9 +1994,9 @@ namespace osl_ThreadData
 
             }
 
-        CPPUNIT_TEST_SUITE(ctors);
+        SAL_CPPUNIT_TEST_SUITE(ctors);
         CPPUNIT_TEST(ctor_001);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class ctors
 
 
@@ -2107,11 +2107,11 @@ namespace osl_ThreadData
                     );
             }
 
-        CPPUNIT_TEST_SUITE(setData);
+        SAL_CPPUNIT_TEST_SUITE(setData);
         CPPUNIT_TEST(setData_001);
         CPPUNIT_TEST(setData_002);
         CPPUNIT_TEST(setData_003);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class setData
 
     class getData : public CppUnit::TestFixture
@@ -2191,10 +2191,10 @@ namespace osl_ThreadData
 
             }
 
-        CPPUNIT_TEST_SUITE(getData);
+        SAL_CPPUNIT_TEST_SUITE(getData);
         CPPUNIT_TEST(getData_001);
         CPPUNIT_TEST(getData_002);
-        CPPUNIT_TEST_SUITE_END();
+        SAL_CPPUNIT_TEST_SUITE_END();
     }; // class getData
 
 // -----------------------------------------------------------------------------

sal/qa/osl/process/osl_process.cxx

@@ -304,12 +304,12 @@ public:
         osl_freeProcessHandle(process);
     }
 
-    CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
+    SAL_CPPUNIT_TEST_SUITE(Test_osl_joinProcess);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_timeout_failure);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_without_timeout_failure);
     CPPUNIT_TEST(osl_joinProcessWithTimeout_infinite);
     CPPUNIT_TEST(osl_joinProcess);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 };
 
 //#########################################################
@@ -740,7 +740,7 @@ public:
         osl_freeProcessHandle(process);
     }
 
-    CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
+    SAL_CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
     //TODO: Repair these under windows.
 #ifndef WNT
     CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
@@ -750,7 +750,7 @@ public:
     // CPPUNIT_TEST(osl_execProc_test_batch);
     ///TODO: Repair test (or tested function ;-) - test fails.
     // CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 };
 
 //#####################################

sal/qa/osl/security/osl_Security.cxx

@@ -93,9 +93,9 @@ namespace osl_Security
                                     aSec.getHandle( ) != NULL );
         }
 
-        CPPUNIT_TEST_SUITE( ctors );
+        SAL_CPPUNIT_TEST_SUITE( ctors );
         CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class ctors
 
 
@@ -130,7 +130,7 @@ namespace osl_Security
         }
 
 
-        CPPUNIT_TEST_SUITE( logonUser );
+        SAL_CPPUNIT_TEST_SUITE( logonUser );
         if  ( !aStringForward.equals( aNullUrl )  && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) ==  aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) )
         /// if user name and passwd are forwarded
         {
@@ -141,7 +141,7 @@ namespace osl_Security
         {
             CPPUNIT_TEST( logonUser_user_pwd_server );
         }
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class logonUser
 
 
@@ -170,9 +170,9 @@ namespace osl_Security
             CPPUNIT_ASSERT_MESSAGE( aMessage.getStr(), strUserID.equals(strID) && (bRes == sal_True));
         }
 
-        CPPUNIT_TEST_SUITE( getUserIdent );
+        SAL_CPPUNIT_TEST_SUITE( getUserIdent );
         CPPUNIT_TEST( getUserIdent_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUserIdent
 
 
@@ -203,9 +203,9 @@ namespace osl_Security
                                     ( nPos >= 0 ) && ( sal_True == bRes ) );
         }
 
-        CPPUNIT_TEST_SUITE( getUserName );
+        SAL_CPPUNIT_TEST_SUITE( getUserName );
         CPPUNIT_TEST( getUserName_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getUserName
 
 
@@ -227,9 +227,9 @@ namespace osl_Security
                                      ( sal_True == bRes ));
         }
 
-        CPPUNIT_TEST_SUITE( getConfigDir );
+        SAL_CPPUNIT_TEST_SUITE( getConfigDir );
         CPPUNIT_TEST( getConfigDir_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getConfigDir
 
     /** testing the method:
@@ -249,9 +249,9 @@ namespace osl_Security
                                      bRes == isAdmin );
         }
 
-        CPPUNIT_TEST_SUITE( isAdministrator );
+        SAL_CPPUNIT_TEST_SUITE( isAdministrator );
         CPPUNIT_TEST( isAdministrator_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class isAdministrator
 
     /** testing the method:
@@ -271,9 +271,9 @@ namespace osl_Security
                                      bRes == sal_True );
         }
 
-        CPPUNIT_TEST_SUITE( getHandle );
+        SAL_CPPUNIT_TEST_SUITE( getHandle );
         CPPUNIT_TEST( getHandle_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class getHandle
 
 
@@ -296,10 +296,10 @@ namespace osl_Security
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", sal_True );
             }
 
-        CPPUNIT_TEST_SUITE( UserProfile );
+        SAL_CPPUNIT_TEST_SUITE( UserProfile );
         CPPUNIT_TEST( loadUserProfile );
         CPPUNIT_TEST( unloadUserProfile );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class UserProfile
 
     class loginUserOnFileServer : public CppUnit::TestFixture
@@ -319,9 +319,9 @@ namespace osl_Security
                 CPPUNIT_ASSERT_MESSAGE( "empty function.", erg == osl_Security_E_UserUnknown );
             }
 
-        CPPUNIT_TEST_SUITE( loginUserOnFileServer );
+        SAL_CPPUNIT_TEST_SUITE( loginUserOnFileServer );
         CPPUNIT_TEST( loginUserOnFileServer_001 );
-        CPPUNIT_TEST_SUITE_END( );
+        SAL_CPPUNIT_TEST_SUITE_END( );
     }; // class loginUserOnFileServer
 
 // -----------------------------------------------------------------------------

sal/qa/rtl/cipher/rtl_cipher.cxx

@@ -125,7 +125,7 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(create);
+    SAL_CPPUNIT_TEST_SUITE(create);
     CPPUNIT_TEST(create_001);
     CPPUNIT_TEST(create_002);
     CPPUNIT_TEST(create_003);
@@ -134,7 +134,7 @@ public:
     CPPUNIT_TEST(create_006);
     CPPUNIT_TEST(create_007);
     CPPUNIT_TEST(create_008);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class create
 
 // -----------------------------------------------------------------------------
@@ -178,12 +178,12 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(createBF);
+    SAL_CPPUNIT_TEST_SUITE(createBF);
     CPPUNIT_TEST(createBF_001);
     CPPUNIT_TEST(createBF_002);
     CPPUNIT_TEST(createBF_003);
     CPPUNIT_TEST(createBF_004);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class createBF
 // -----------------------------------------------------------------------------
 class decode : public CppUnit::TestFixture
@@ -319,10 +319,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(decode);
+    SAL_CPPUNIT_TEST_SUITE(decode);
     CPPUNIT_TEST(decode_001);
     CPPUNIT_TEST(decode_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class decode
 // -----------------------------------------------------------------------------
 class decodeBF : public CppUnit::TestFixture
@@ -344,9 +344,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(decodeBF);
+    SAL_CPPUNIT_TEST_SUITE(decodeBF);
     CPPUNIT_TEST(decodeBF_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class decodeBF
 // -----------------------------------------------------------------------------
 class destroy : public CppUnit::TestFixture
@@ -371,9 +371,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(destroy);
+    SAL_CPPUNIT_TEST_SUITE(destroy);
     CPPUNIT_TEST(destroy_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class destroy
 // -----------------------------------------------------------------------------
 class destroyBF : public CppUnit::TestFixture
@@ -400,9 +400,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(destroyBF);
+    SAL_CPPUNIT_TEST_SUITE(destroyBF);
     CPPUNIT_TEST(destroyBF_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class destroyBF
 // -----------------------------------------------------------------------------
 class encode : public CppUnit::TestFixture
@@ -473,9 +473,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(encode);
+    SAL_CPPUNIT_TEST_SUITE(encode);
     CPPUNIT_TEST(encode_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class encode
 // -----------------------------------------------------------------------------
 class encodeBF : public CppUnit::TestFixture
@@ -497,9 +497,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(encodeBF);
+    SAL_CPPUNIT_TEST_SUITE(encodeBF);
     CPPUNIT_TEST(encodeBF_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class encodeBF
 // -----------------------------------------------------------------------------
 class init : public CppUnit::TestFixture
@@ -607,12 +607,12 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(init);
+    SAL_CPPUNIT_TEST_SUITE(init);
     CPPUNIT_TEST(init_001);
     CPPUNIT_TEST(init_002);
     CPPUNIT_TEST(init_003);
     CPPUNIT_TEST(init_004);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class init
 // -----------------------------------------------------------------------------
 class initBF : public CppUnit::TestFixture
@@ -636,9 +636,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(initBF);
+    SAL_CPPUNIT_TEST_SUITE(initBF);
     CPPUNIT_TEST(initBF_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class initBF
 
 // -----------------------------------------------------------------------------

sal/qa/rtl/locale/rtl_locale.cxx

@@ -84,10 +84,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(getDefault);
+    SAL_CPPUNIT_TEST_SUITE(getDefault);
     CPPUNIT_TEST(getDefault_000);
     CPPUNIT_TEST(getDefault_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class getDefault
 
 
@@ -120,9 +120,9 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(setDefault);
+    SAL_CPPUNIT_TEST_SUITE(setDefault);
     CPPUNIT_TEST(setDefault_001);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class setDefault
 
 
@@ -158,10 +158,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(getLanguage);
+    SAL_CPPUNIT_TEST_SUITE(getLanguage);
     CPPUNIT_TEST(getLanguage_001);
     CPPUNIT_TEST(getLanguage_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class getLanguage
 
 
@@ -197,10 +197,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(getCountry);
+    SAL_CPPUNIT_TEST_SUITE(getCountry);
     CPPUNIT_TEST(getCountry_001);
     CPPUNIT_TEST(getCountry_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class getCountry
 
 
@@ -236,10 +236,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(getVariant);
+    SAL_CPPUNIT_TEST_SUITE(getVariant);
     CPPUNIT_TEST(getVariant_001);
     CPPUNIT_TEST(getVariant_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class getVariant
 
 
@@ -275,10 +275,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(hashCode);
+    SAL_CPPUNIT_TEST_SUITE(hashCode);
     CPPUNIT_TEST(hashCode_001);
     CPPUNIT_TEST(hashCode_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class hashCode
 
 
@@ -321,10 +321,10 @@ public:
     // member functions of the current class,
     // because these macros are need by auto register mechanism.
 
-    CPPUNIT_TEST_SUITE(equals);
+    SAL_CPPUNIT_TEST_SUITE(equals);
     CPPUNIT_TEST(equals_001);
     CPPUNIT_TEST(equals_002);
-    CPPUNIT_TEST_SUITE_END();
+    SAL_CPPUNIT_TEST_SUITE_END();
 }; // class equals
 
 // -----------------------------------------------------------------------------