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

7 files changed, 57 insertions, 57 deletions

diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index 66f1d5ede2e6..7daf9eec52d2 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -33,7 +33,7 @@ namespace
 
         virtual bool load(const OUString &,
             const OUString &rURL, const OUString &,
-            unsigned int, unsigned int, unsigned int);
+            unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
 
         void test();
 
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b7fea66b919c..56c6c30a306e 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -110,11 +110,11 @@ public:
     short     GetSize()  { return mnSize; }
 
 public:
-    virtual oslInterlockedCount SAL_CALL acquire()
+    virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE
     {
         return ++mnRefCount;
     }
-    virtual oslInterlockedCount SAL_CALL release()
+    virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE
     {
         if ( --mnRefCount == 0)
         {
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index f0ff40d4d355..a5b9ab4f1fc8 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -48,7 +48,7 @@ class StgDirEntry : public StgAvlNode
     bool         bRemoved;                  // removed per Invalidate()
     bool         bRenamed;                  // renamed
     void         InitMembers();             // ctor helper
-    virtual short Compare( const StgAvlNode* ) const;
+    virtual short Compare( const StgAvlNode* ) const SAL_OVERRIDE;
     bool         StoreStream( StgIo& );     // store the stream
     bool         StoreStreams( StgIo& );    // store all streams
     void         RevertAll();               // revert the whole tree
@@ -99,7 +99,7 @@ class StgDirStrm : public StgDataStrm
 public:
     StgDirStrm( StgIo& );
     ~StgDirStrm();
-    virtual bool SetSize( sal_Int32 );              // change the size
+    virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE;              // change the size
     bool         Store();
     void*        GetEntry( sal_Int32 n, bool=false );// get an entry
     StgDirEntry* GetRoot() { return pRoot; }
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index eadb7e86436f..9dd24ee5cba0 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -28,10 +28,10 @@
 class StgInternalStream : public SvStream
 {
     BaseStorageStream* pStrm;
-    virtual sal_uLong GetData( void* pData, sal_uLong nSize );
-    virtual sal_uLong PutData( const void* pData, sal_uLong nSize );
-    virtual sal_uLong SeekPos( sal_uLong nPos );
-    virtual void      FlushData();
+    virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE;
+    virtual void      FlushData() SAL_OVERRIDE;
 public:
     StgInternalStream( BaseStorage&, const OUString&, bool );
    ~StgInternalStream();
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 2d8d4de51d4f..e2c2574ceff4 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.hxx
@@ -98,15 +98,15 @@ public:
 // FAT allocator.
 
 class StgFATStrm : public StgStrm {     // the master FAT stream
-    virtual bool Pos2Page( sal_Int32 nBytePos );
+    virtual bool Pos2Page( sal_Int32 nBytePos ) SAL_OVERRIDE;
     bool  SetPage( short, sal_Int32 );
 public:
     StgFATStrm( StgIo& );
     virtual ~StgFATStrm() {}
     using StgStrm::GetPage;
     sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = 0);
-    virtual bool SetSize( sal_Int32 );
-    virtual rtl::Reference< StgPage > GetPhysPage( sal_Int32 nBytePos, bool bForce = false );
+    virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE;
+    virtual rtl::Reference< StgPage > GetPhysPage( sal_Int32 nBytePos, bool bForce = false ) SAL_OVERRIDE;
 };
 
 // The stream has a size increment which normally is 1, but which can be
@@ -121,9 +121,9 @@ public:
     StgDataStrm( StgIo&, StgDirEntry& );
     void* GetPtr( sal_Int32 nPos, bool bForce, bool bDirty );
     void SetIncrement( short n ) { nIncr = n ; }
-    virtual bool SetSize( sal_Int32 );
-    virtual sal_Int32 Read( void*, sal_Int32 );
-    virtual sal_Int32 Write( const void*, sal_Int32 );
+    virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE;
+    virtual sal_Int32 Read( void*, sal_Int32 ) SAL_OVERRIDE;
+    virtual sal_Int32 Write( const void*, sal_Int32 ) SAL_OVERRIDE;
 };
 
 // The small stream class provides access to streams with a size < 4096 bytes.
@@ -138,9 +138,9 @@ class StgSmallStrm : public StgStrm     // a logical data stream
 public:
     StgSmallStrm( StgIo&, sal_Int32 nBgn, sal_Int32 nLen );
     StgSmallStrm( StgIo&, StgDirEntry& );
-    virtual sal_Int32 Read( void*, sal_Int32 );
-    virtual sal_Int32 Write( const void*, sal_Int32 );
-    virtual bool IsSmallStrm() const { return true; }
+    virtual sal_Int32 Read( void*, sal_Int32 ) SAL_OVERRIDE;
+    virtual sal_Int32 Write( const void*, sal_Int32 ) SAL_OVERRIDE;
+    virtual bool IsSmallStrm() const SAL_OVERRIDE { return true; }
 };
 
 class StgTmpStrm : public SvMemoryStream
@@ -148,16 +148,16 @@ class StgTmpStrm : public SvMemoryStream
     OUString aName;
     SvFileStream* pStrm;
     using SvMemoryStream::GetData;
-    virtual sal_uLong GetData( void* pData, sal_uLong nSize );
-    virtual sal_uLong PutData( const void* pData, sal_uLong nSize );
-    virtual sal_uLong SeekPos( sal_uLong nPos );
-    virtual void FlushData();
+    virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong SeekPos( sal_uLong nPos ) SAL_OVERRIDE;
+    virtual void FlushData() SAL_OVERRIDE;
 
 public:
     StgTmpStrm( sal_uLong=16 );
    ~StgTmpStrm();
     bool Copy( StgTmpStrm& );
-    void SetSize( sal_uLong );
+    void SetSize( sal_uLong ) SAL_OVERRIDE;
     sal_uLong GetSize() const;
 };
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 57ab854ab74c..117c7322e3ee 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -91,14 +91,14 @@ public:
     FileStreamWrapper_Impl( const OUString& rName );
     virtual ~FileStreamWrapper_Impl();
 
-    virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception);
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw ( IOException, RuntimeException, std::exception);
-    virtual sal_Int64 SAL_CALL getLength(  ) throw ( IOException, RuntimeException, std::exception);
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception );
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception );
-    virtual void      SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception);
-    virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception );
-    virtual void      SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception );
+    virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int64 SAL_CALL getPosition(  ) throw ( IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int64 SAL_CALL getLength(  ) throw ( IOException, RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void      SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void      SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE;
 
 protected:
     void checkConnected();
@@ -405,12 +405,12 @@ class UCBStorageStream_Impl : public SvRefBase, public SvStream
                                 ~UCBStorageStream_Impl();
 public:
 
-    virtual sal_uLong           GetData( void* pData, sal_uLong nSize );
-    virtual sal_uLong           PutData( const void* pData, sal_uLong nSize );
-    virtual sal_uLong           SeekPos( sal_uLong nPos );
-    virtual void                SetSize( sal_uLong nSize );
-    virtual void                FlushData();
-    virtual void                ResetError();
+    virtual sal_uLong           GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong           PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual sal_uLong           SeekPos( sal_uLong nPos ) SAL_OVERRIDE;
+    virtual void                SetSize( sal_uLong nSize ) SAL_OVERRIDE;
+    virtual void                FlushData() SAL_OVERRIDE;
+    virtual void                ResetError() SAL_OVERRIDE;
 
     UCBStorageStream*           m_pAntiImpl;    // only valid if an external reference exists
 
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index c9777c3c3396..ad98f7854595 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -84,7 +84,7 @@ public:
 
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
         throw ( ::com::sun::star::uno::Exception,
-                ::com::sun::star::uno::RuntimeException, std::exception);
+                ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 
     //  XNameContainer
@@ -94,50 +94,50 @@ public:
         throw ( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::ElementExistException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception);
+                ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeByName( const OUString& Name )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception);
+                ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw ( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception);
+                ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception );
+                ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL hasElements()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XComponent
 
 
     virtual void SAL_CALL dispose()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual void SAL_CALL addEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual void SAL_CALL removeEventListener(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XTransactedObject
@@ -146,40 +146,40 @@ public:
     virtual void SAL_CALL commit()
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception );
+                ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual void SAL_CALL revert()
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::lang::WrappedTargetException,
-                ::com::sun::star::uno::RuntimeException, std::exception );
+                ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XClassifiedObject
 
 
     virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL getClassName()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual void SAL_CALL setClassInfo( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID,
                                         const OUString& sClassName )
         throw ( ::com::sun::star::lang::NoSupportException,
-                ::com::sun::star::uno::RuntimeException, std::exception );
+                ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 
     //  XServiceInfo
 
 
     virtual OUString SAL_CALL getImplementationName()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 };