First batch of adding SAL_OVERRRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a

18 files changed, 257 insertions, 257 deletions

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 1634a672d015..1faae7192f86 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -79,12 +79,12 @@ class TimingListener
     , private boost::noncopyable
 {
 public:
-    void startTest( CppUnit::Test *)
+    void startTest( CppUnit::Test *) SAL_OVERRIDE
     {
         m_nStartTime = osl_getGlobalTimer();
     }
 
-    void endTest( CppUnit::Test *test )
+    void endTest( CppUnit::Test *test ) SAL_OVERRIDE
     {
         sal_uInt32 nEndTime = osl_getGlobalTimer();
         std::cout << test->getName() << ": " << nEndTime-m_nStartTime
@@ -155,7 +155,7 @@ public:
         CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
         return collector.wasSuccessful();
     }
-    virtual bool operator()() const
+    virtual bool operator()() const SAL_OVERRIDE
     {
         return run();
     }
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 1369421c2f9b..dabfb3afb9d6 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -173,7 +173,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[6];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr1 );
             arrOUS[1] = new OString( kTestStr14 );
@@ -184,7 +184,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -329,11 +329,11 @@ namespace rtl_OStringBuffer
     class  remove : public CppUnit::TestFixture
     {
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
         }
 
@@ -379,7 +379,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[6];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr1 );
             arrOUS[1] = new OString( "1" );
@@ -390,7 +390,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -512,7 +512,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[6];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr1 );
             arrOUS[1] = new OString( "1" );
@@ -523,7 +523,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -976,7 +976,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[6];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr1 );
             arrOUS[1] = new OString( "1" );
@@ -987,7 +987,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -1558,7 +1558,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -1568,7 +1568,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -1967,7 +1967,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -1977,7 +1977,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -2354,7 +2354,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -2364,7 +2364,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -2740,7 +2740,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -2750,7 +2750,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -2975,7 +2975,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -2985,7 +2985,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -3208,7 +3208,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -3218,7 +3218,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -5194,7 +5194,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -5204,7 +5204,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -6205,7 +6205,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -6215,7 +6215,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -8255,7 +8255,7 @@ namespace rtl_OStringBuffer
         sal_Int32 intVal;
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -8266,7 +8266,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -8383,7 +8383,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -8393,7 +8393,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -8957,7 +8957,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -8967,7 +8967,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -10943,7 +10943,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -10953,7 +10953,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -11954,7 +11954,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -11964,7 +11964,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -14007,7 +14007,7 @@ namespace rtl_OStringBuffer
         sal_Int64 intVal;
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -14018,7 +14018,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -14133,7 +14133,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -14143,7 +14143,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -14716,7 +14716,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -14726,7 +14726,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -15452,7 +15452,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -15462,7 +15462,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -16203,7 +16203,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -16213,7 +16213,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
@@ -16265,7 +16265,7 @@ namespace rtl_OStringBuffer
         OString* arrOUS[5];
 
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             arrOUS[0] = new OString( kTestStr7 );
             arrOUS[1] = new OString(  );
@@ -16275,7 +16275,7 @@ namespace rtl_OStringBuffer
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
             delete arrOUS[3]; delete arrOUS[4];
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 48e04011e38a..3c3401a8eb6d 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -76,7 +76,7 @@ protected:
     ::osl::Condition& m_MyCon;
     ConditionType m_MyType;
 
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
     {
         switch ( m_MyType )
         {
@@ -233,7 +233,7 @@ namespace osl_Condition
         bool bRes, bRes1, bRes2;
         TimeValue *tv1;
 
-        void setUp( )
+        void setUp( ) SAL_OVERRIDE
         {
             tv1 = new TimeValue;
             tv1->Seconds = 1;
@@ -241,7 +241,7 @@ namespace osl_Condition
 
         }
 
-        void tearDown( )
+        void tearDown( ) SAL_OVERRIDE
         {
             delete tv1;
         }
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 525630368fc4..df9d3a5046b3 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1306,12 +1306,12 @@ namespace osl_FileBase
         public:
         getTempDirURL() :nError(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
              nError = FileBase::getTempDirURL( aUStr );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
         }
 
@@ -1366,7 +1366,7 @@ namespace osl_FileBase
         }
 
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             pHandle = new oslFileHandle();
             pUStr_DirURL = new ::rtl::OUString( aUserDirectoryURL );
@@ -1374,7 +1374,7 @@ namespace osl_FileBase
             //*pUStr_DirURL = aUserDirectoryURL;                /// create temp file in /tmp/PID or c:\temp\PID.*/
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             delete pUStr_DirURL;
             delete pUStr_FileURL;
@@ -1480,11 +1480,11 @@ namespace osl_VolumeInfo
         public:
         ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
         }
 
@@ -1576,11 +1576,11 @@ namespace osl_VolumeInfo
         public:
         isValid() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
 
         }
@@ -2390,7 +2390,7 @@ namespace osl_FileStatus
         public:
         ctors() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -2412,7 +2412,7 @@ namespace osl_FileStatus
             */
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -2466,7 +2466,7 @@ namespace osl_FileStatus
         }
 
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -2480,7 +2480,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             ::osl::FileBase::RC nError1 = pDir->close();
             delete pDir;
@@ -2672,7 +2672,7 @@ namespace osl_FileStatus
         public:
         getFileType() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile: $TEMP/tmpdir/tmpname.
             //        a tempdirectory: $TEMP/tmpdir/tmpdir.
@@ -2698,7 +2698,7 @@ namespace osl_FileStatus
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove all in $TEMP/tmpdir.
             deleteTestDirectory( aTmpName3, aTmpName1 );
@@ -2801,7 +2801,7 @@ namespace osl_FileStatus
         public:
         getAttributes() :nError(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             aTypeURL = aUserDirectoryURL.copy( 0 );
             concatURL( aTypeURL, aTmpName2 );
@@ -2816,7 +2816,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( nError == FileBase::E_None );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTypeURL );
             deleteTestFile( aTypeURL_Hid );
@@ -2931,7 +2931,7 @@ namespace osl_FileStatus
         public:
         getAccessTime() :nError(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             aTypeURL = aUserDirectoryURL.copy( 0 );
             concatURL( aTypeURL, aTmpName2 );
@@ -2941,7 +2941,7 @@ namespace osl_FileStatus
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTypeURL );
         }
@@ -3045,7 +3045,7 @@ namespace osl_FileStatus
         getFileSize() :nError(FileBase::E_None) {}
 
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             aTypeURL = aUserDirectoryURL.copy( 0 );
             concatURL( aTypeURL, aTmpName2 );
@@ -3054,7 +3054,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( nError == FileBase::E_None );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTypeURL );
         }
@@ -3109,7 +3109,7 @@ namespace osl_FileStatus
         public:
         getFileName() :nError(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             aTypeURL = aUserDirectoryURL.copy( 0 );
             concatURL( aTypeURL, aTmpName2 );
@@ -3118,7 +3118,7 @@ namespace osl_FileStatus
             CPPUNIT_ASSERT( nError == FileBase::E_None );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTypeURL );
         }
@@ -3155,14 +3155,14 @@ namespace osl_FileStatus
         getFileURL() :nError(FileBase::E_None) {}
 
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             createTestFile( aTmpName6 );
             nError = ::osl::DirectoryItem::get( aTmpName6, rItem );
             CPPUNIT_ASSERT( nError == FileBase::E_None );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTmpName6 );
         }
@@ -3200,14 +3200,14 @@ namespace osl_FileStatus
         getLinkTargetURL() :nError(FileBase::E_None) {}
         // test code.
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             aTypeURL = aUserDirectoryURL.copy( 0 );
             concatURL( aTypeURL, aTmpName2 );
             createTestFile( aTypeURL );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             deleteTestFile( aTypeURL );
         }
@@ -3287,14 +3287,14 @@ namespace osl_File
 
         public:
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3346,14 +3346,14 @@ namespace osl_File
             , nError2(FileBase::E_None)
             , nError3(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3471,14 +3471,14 @@ namespace osl_File
             , nError2(FileBase::E_None)
             , nError3(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3535,7 +3535,7 @@ namespace osl_File
         setPos() :nError1(FileBase::E_None) {}
 
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -3552,7 +3552,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3639,7 +3639,7 @@ namespace osl_File
         public:
         getPos() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -3656,7 +3656,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3705,7 +3705,7 @@ namespace osl_File
         public:
         isEndOfFile() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -3722,7 +3722,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3800,7 +3800,7 @@ namespace osl_File
         public:
         setSize() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -3817,7 +3817,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3900,7 +3900,7 @@ namespace osl_File
         public:
         read() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -3917,7 +3917,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -3989,13 +3989,13 @@ namespace osl_File
         public:
         write() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4050,7 +4050,7 @@ namespace osl_File
         public:
         readLine() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
@@ -4075,7 +4075,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4162,7 +4162,7 @@ namespace osl_File
         public:
         copy() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -4179,7 +4179,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -4297,7 +4297,7 @@ namespace osl_File
         public:
         move() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -4314,7 +4314,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -4459,7 +4459,7 @@ namespace osl_File
         public:
         remove() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
@@ -4476,7 +4476,7 @@ namespace osl_File
             CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -4545,13 +4545,13 @@ namespace osl_File
         public:
         setAttributes() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4641,13 +4641,13 @@ namespace osl_File
         public:
         setTime() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4725,14 +4725,14 @@ namespace osl_File
         public:
         sync() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestFile( aTmpName6 );
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4814,13 +4814,13 @@ namespace osl_DirectoryItem
         public:
         ctors() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4856,13 +4856,13 @@ namespace osl_DirectoryItem
         public:
         copy_assin_Ctors() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4919,13 +4919,13 @@ namespace osl_DirectoryItem
         public:
         is() :nError1(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -4968,13 +4968,13 @@ namespace osl_DirectoryItem
         public:
         get() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpname.
             createTestFile( aTmpName6 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpname.
             deleteTestFile( aTmpName6 );
@@ -5035,14 +5035,14 @@ namespace osl_DirectoryItem
         public:
         getFileStatus() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -5129,14 +5129,14 @@ namespace osl_Directory
         public:
         ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -5194,14 +5194,14 @@ namespace osl_Directory
         public:
         open() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -5293,14 +5293,14 @@ namespace osl_Directory
         public:
         isOpen() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempfile in $TEMP/tmpdir/tmpname.
             createTestDirectory( aTmpName3 );
             createTestFile( aTmpName4 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove the tempfile in $TEMP/tmpdir/tmpname.
             deleteTestFile( aTmpName4 );
@@ -5351,13 +5351,13 @@ namespace osl_Directory
         public:
         close() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempdirectory : $TEMP/tmpdir.
             createTestDirectory( aTmpName3 );
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove a tempdirectory : $TEMP/tmpdir.
             deleteTestDirectory( aTmpName3 );
@@ -5409,7 +5409,7 @@ namespace osl_Directory
         public:
         reset() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempdirectory : $TEMP/tmpdir.
             createTestDirectory( aTmpName3 );
@@ -5419,7 +5419,7 @@ namespace osl_Directory
             createTestFile( aTmpName3, aHidURL1);
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
             deleteTestFile( aTmpName3, aHidURL1);
@@ -5525,7 +5525,7 @@ namespace osl_Directory
         public:
         getNextItem() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
         // initialization
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
             // create a tempdirectory : $TEMP/tmpdir.
             createTestDirectory( aTmpName3 );
@@ -5536,7 +5536,7 @@ namespace osl_Directory
 
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
             // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
             deleteTestFile( aTmpName3, aHidURL1 );
@@ -6131,7 +6131,7 @@ namespace osl_Directory
         {
         }
 
-        virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/)
+        virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) SAL_OVERRIDE
         {
             i++;
         };
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 096de9c9b8c9..2d5e977c96ed 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -103,7 +103,7 @@ public:
 protected:
     struct resource *pResource;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         pResource->lock.acquire( );
         for( sal_Int8 i = 0; i < 3; i++ )
@@ -131,7 +131,7 @@ public:
 protected:
     struct resource *pResource;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         pResource->lock.acquire( );
         for( sal_Int8 i = 0; i < 3; i++ )
@@ -169,7 +169,7 @@ public:
 protected:
     struct chain* pChain;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         //block here if the mutex has been acquired
         pChain->lock.acquire( );
@@ -207,7 +207,7 @@ public:
 protected:
     Mutex* pMyMutex;
 
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
     {
         // block here if the mutex has been acquired
         pMyMutex->acquire( );
@@ -229,7 +229,7 @@ public:
 protected:
     Mutex* pMyMutex;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         // block here if the mutex has been acquired
         pMyMutex->acquire( );
@@ -251,7 +251,7 @@ public:
         CPPUNIT_ASSERT_MESSAGE( "#GlobalMutexThread does not shutdown properly.\n", !isRunning( ) );
     }
 protected:
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         // block here if the mutex has been acquired
         Mutex* pGlobalMutex;
@@ -276,7 +276,7 @@ namespace osl_Mutex
         struct chain m_Data;
         struct resource m_Res;
 
-        void setUp( )
+        void setUp( ) SAL_OVERRIDE
         {
             for ( sal_Int8 i=0; i < BUFFER_SIZE; i++ )
                 m_Data.buffer[i] = 0;
@@ -286,7 +286,7 @@ namespace osl_Mutex
             m_Res.data2 = 0;
         }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
         {
         }
 
@@ -574,7 +574,7 @@ public:
 protected:
     Mutex* pMyMutex;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         // block here if the mutex has been acquired
         MutexGuard aGuard( pMyMutex );
@@ -660,7 +660,7 @@ public:
 protected:
     Mutex* pMyMutex;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         // acquire the mutex
         // printf("# ClearGuardThread" );
@@ -802,7 +802,7 @@ public:
 protected:
     Mutex* pMyMutex;
 
-    void SAL_CALL run( )
+    void SAL_CALL run( ) SAL_OVERRIDE
     {
         // acquire the mutex
         printf("# ResettableGuard\n" );
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index e13797b475cf..74e692e2c0f6 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -238,7 +238,7 @@ protected:
 
         @see ThreadSafeValue
     */
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             while(schedule())
             {
@@ -249,7 +249,7 @@ protected:
 
 public:
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             m_aFlag.acquire();
             ::osl::Thread::suspend();
@@ -286,7 +286,7 @@ public:
             //m_bWait = sal_True;
         }
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             m_aFlag.acquire();
             ::osl::Thread::suspend();
@@ -297,7 +297,7 @@ protected:
     //sal_Bool m_bWait;
     sal_Int32 m_nWaitSec;
 
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             /// if the thread should terminate, schedule return false
             while (m_aFlag.getValue() < 20 && schedule())
@@ -315,7 +315,7 @@ protected:
                 }
             }
         }
-    void SAL_CALL onTerminated()
+    void SAL_CALL onTerminated() SAL_OVERRIDE
         {
             t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
         }
@@ -343,7 +343,7 @@ public:
         {
             m_bSuspend = true;
         }
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             m_aFlag.acquire();
             ::osl::Thread::suspend();
@@ -351,7 +351,7 @@ public:
         }
 protected:
     bool m_bSuspend;
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             //if the thread should terminate, schedule return false
             while (schedule())
@@ -386,14 +386,14 @@ class ONoScheduleThread : public Thread
 public:
     sal_Int32 getValue() { return m_aFlag.getValue(); }
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             m_aFlag.acquire();
             ::osl::Thread::suspend();
             m_aFlag.release();
         }
 protected:
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             while (m_aFlag.getValue() < 10)
             {
@@ -401,7 +401,7 @@ protected:
                 ThreadHelper::thread_sleep_tenth_sec(1);
             }
         }
-    void SAL_CALL onTerminated()
+    void SAL_CALL onTerminated() SAL_OVERRIDE
         {
             t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
         }
@@ -430,14 +430,14 @@ public:
     OAddThread(){}
     sal_Int32 getValue() { return m_aFlag.getValue(); }
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             m_aFlag.acquire();
             ::osl::Thread::suspend();
             m_aFlag.release();
         }
 protected:
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             //if the thread should terminate, schedule return false
             while (schedule())
@@ -445,7 +445,7 @@ protected:
                 m_aFlag.addValue(1);
             }
         }
-    void SAL_CALL onTerminated()
+    void SAL_CALL onTerminated() SAL_OVERRIDE
         {
             // t_print("normally terminate this thread %d!\n", getIdentifier());
         }
@@ -502,11 +502,11 @@ namespace osl_Thread
     public:
 
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -572,11 +572,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -653,11 +653,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -747,11 +747,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -832,11 +832,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -911,11 +911,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1003,11 +1003,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1070,11 +1070,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1530,11 +1530,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1585,11 +1585,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1616,11 +1616,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1659,11 +1659,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1724,11 +1724,11 @@ namespace osl_Thread
     class yield : public CppUnit::TestFixture
     {
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1749,11 +1749,11 @@ namespace osl_Thread
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1910,7 +1910,7 @@ public:
 private:
     char m_nData;
 
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             char * pc = new char[2];
 //      strcpy(pc, &m_nData);
@@ -1940,7 +1940,7 @@ class idThread: public Thread
 public:
     oslThreadIdentifier m_Id;
 private:
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             oslThreadIdentifier* pId = new oslThreadIdentifier;
             *pId = getIdentifier();
@@ -1968,11 +1968,11 @@ namespace osl_ThreadData
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -1992,11 +1992,11 @@ namespace osl_ThreadData
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
@@ -2106,11 +2106,11 @@ namespace osl_ThreadData
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 9df0de13f922..e4d2028fb55e 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -433,13 +433,13 @@ public:
     }
 
 
-    virtual void setUp()
+    virtual void setUp() SAL_OVERRIDE
     {
         temp_file_path_ = create_temp_file(temp_file_url_);
         parameters_[1]  = temp_file_path_.pData;
     }
 
-    virtual void tearDown()
+    virtual void tearDown() SAL_OVERRIDE
     {
         osl::File::remove(temp_file_url_);
     }
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 54fb89c7d435..61a79340ca24 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -336,7 +336,7 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl
     public:
     MyTestPlugInImpl() {};
     void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
-                   const CPPUNIT_NS::PlugInParameters &parameters );
+                   const CPPUNIT_NS::PlugInParameters &parameters ) SAL_OVERRIDE;
 };
 
 
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index d9a15f132380..d55284925c56 100644
--- a/sal/qa/osl/setthreadname/test-setthreadname.cxx
+++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx
@@ -33,7 +33,7 @@ namespace {
 
 class TestThread: public osl::Thread, private boost::noncopyable {
 private:
-    virtual void SAL_CALL run();
+    virtual void SAL_CALL run() SAL_OVERRIDE;
 };
 
 void TestThread::run() {
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 2bfa2f52355d..9bf2716266be 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -58,12 +58,12 @@ public:
     }
 
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         m_pMemory = (char*) rtl_allocateMemory( m_nSizeOfMemory );
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
         rtl_freeMemory(m_pMemory);
         m_pMemory = NULL;
@@ -106,12 +106,12 @@ public:
     }
 
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         m_pZeroMemory = (char*) rtl_allocateZeroMemory( m_nSizeOfZeroMemory );
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
         rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
         // LLA: no check possible, may GPF if there is something wrong.
diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx
index 9aad9ddbcde6..b1eb23b82543 100644
--- a/sal/qa/rtl/bootstrap/expand.cxx
+++ b/sal/qa/rtl/bootstrap/expand.cxx
@@ -20,7 +20,7 @@ namespace {
 
 class Test: public CppUnit::TestFixture {
 public:
-    virtual void setUp();
+    virtual void setUp() SAL_OVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 3c1b51ca4065..9a71bb568bd7 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -35,11 +35,11 @@ class create : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -108,11 +108,11 @@ class createBF : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -156,11 +156,11 @@ class decode : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -293,11 +293,11 @@ class decodeBF : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -317,11 +317,11 @@ class destroy : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -344,11 +344,11 @@ class destroyBF : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -373,11 +373,11 @@ class encode : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -446,11 +446,11 @@ class encodeBF : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -470,11 +470,11 @@ class init : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -583,11 +583,11 @@ class initBF : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index 63e68d73c8c9..81a507b33f0e 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -31,11 +31,11 @@ class test : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 169c0d8ab337..84685b8880a7 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -109,7 +109,7 @@ protected:
 
         @see ThreadSafeValue
     */
-    void SAL_CALL run()
+    void SAL_CALL run() SAL_OVERRIDE
         {
             while(schedule())
             {
@@ -128,7 +128,7 @@ protected:
 
 public:
 
-    virtual void SAL_CALL suspend()
+    virtual void SAL_CALL suspend() SAL_OVERRIDE
         {
             ::osl::Thread::suspend();
         }
@@ -154,11 +154,11 @@ namespace rtl_DoubleLocking
     public:
 
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 6c7127844f09..ecfc08a0237e 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -38,13 +38,13 @@ class getDefault : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -68,13 +68,13 @@ class setDefault : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
         setDefaultLocale();
     }
@@ -103,13 +103,13 @@ class getLanguage : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -142,13 +142,13 @@ class getCountry : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -181,13 +181,13 @@ class getVariant : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -220,13 +220,13 @@ class hashCode : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -259,13 +259,13 @@ class equals : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
         // start message
         rtl_locale::setDefaultLocale();
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index d93075aa6969..c17a45b344d9 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -73,11 +73,11 @@ class getAppCommandArg : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -201,11 +201,11 @@ class getGlobalProcessId : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
     //gets a 16-byte fixed size identifier which is guaranteed not to change    during the current process.
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index f7917a7f2bc4..bb64f4b9c10d 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -32,7 +32,7 @@ namespace
     class testBestMime : public CppUnit::TestFixture
     {
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
         }
 
@@ -472,7 +472,7 @@ namespace
     class testBestUnix : public CppUnit::TestFixture
     {
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
         {
         }
 
@@ -972,7 +972,7 @@ namespace
     class testBestWindows : public CppUnit::TestFixture
     {
     public:
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
@@ -1526,11 +1526,11 @@ namespace
     {
     public:
         // initialise your test code values here.
-        void setUp()
+        void setUp() SAL_OVERRIDE
             {
             }
 
-        void tearDown()
+        void tearDown() SAL_OVERRIDE
             {
             }
 
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index dc3b60f159b1..5b756013e723 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -77,11 +77,11 @@ class createUuid : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }
 
@@ -148,11 +148,11 @@ class createNamedUuid : public CppUnit::TestFixture
 {
 public:
     // initialise your test code values here.
-    void setUp()
+    void setUp() SAL_OVERRIDE
     {
     }
 
-    void tearDown()
+    void tearDown() SAL_OVERRIDE
     {
     }