Second batch of adding SAL_OVERRIDE to overriding function declarations

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

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

6 files changed, 16 insertions, 16 deletions

diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index e5a2874d5271..4d1bb08beb17 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -334,7 +334,7 @@ public:
     virtual ~WorkerThread() {}
 
 protected:
-    virtual void execute()
+    virtual void execute() SAL_OVERRIDE
     {
         processSheetFormulaCells(mrDoc, mrItem, *mpFormatter, mrExternalLinks);
     }
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 1f218582bc47..731be0fcd5b2 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -547,8 +547,8 @@ private:
 private:
     // finalize token sequence ------------------------------------------------
 
-    virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const;
-    virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const;
+    virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE;
+    virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const SAL_OVERRIDE;
 
 protected:
     const sal_Int32     mnMaxApiCol;                /// Maximum column index in own document.
@@ -1246,12 +1246,12 @@ public:
 
     virtual ApiTokenSequence importOoxFormula(
                             const CellAddress& rBaseAddr,
-                            const OUString& rFormulaString );
+                            const OUString& rFormulaString ) SAL_OVERRIDE;
 
     virtual ApiTokenSequence importBiff12Formula(
                             const CellAddress& rBaseAddr,
                             FormulaType eType,
-                            SequenceInputStream& rStrm );
+                            SequenceInputStream& rStrm ) SAL_OVERRIDE;
 
 private:
     // import token contents and create API formula token ---------------------
@@ -1852,7 +1852,7 @@ public:
     virtual ApiTokenSequence importBiffFormula(
                             const CellAddress& rBaseAddr,
                             FormulaType eType,
-                            BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize );
+                            BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) SAL_OVERRIDE;
 
 private:
     // import token contents and create API formula token ---------------------
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index 2fb9aad1d4b2..eeb0e06d027d 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -45,7 +45,7 @@ public:
     Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos );
 
 protected:
-    virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const;
+    virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE;
 
 private:
     ApiParserWrapper    maApiParser;
diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx
index d02095b81ff6..1055e5997de5 100644
--- a/sc/source/filter/oox/threadpool.cxx
+++ b/sc/source/filter/oox/threadpool.cxx
@@ -21,7 +21,7 @@ public:
         salhelper::Thread("sheet-import-thread-pool"),
         mpPool( pPool ) {}
 
-    virtual void execute()
+    virtual void execute() SAL_OVERRIDE
     {
         ThreadTask *pTask;
         while ( ( pTask = waitForWork() ) )
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 149ad06d9768..170348fae63e 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -226,7 +226,7 @@ public:
     {
     }
 
-    virtual void doWork()
+    virtual void doWork() SAL_OVERRIDE
     {
         // We hold the solar mutex in all threads except for
         // the small safe section of the inner loop in
@@ -264,11 +264,11 @@ class ProgressBarTimer : Timer
         }
         virtual ~ProgressWrapper() {}
         // IProgressBar
-        virtual double getPosition() const { return mfPosition; }
-        virtual void   setPosition( double fPosition ) { mfPosition = fPosition; }
+        virtual double getPosition() const SAL_OVERRIDE { return mfPosition; }
+        virtual void   setPosition( double fPosition ) SAL_OVERRIDE { mfPosition = fPosition; }
         // ISegmentProgressBar
-        virtual double getFreeLength() const { return 0.0; }
-        virtual ISegmentProgressBarRef createSegment( double /* fLength */ )
+        virtual double getFreeLength() const SAL_OVERRIDE { return 0.0; }
+        virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) SAL_OVERRIDE
         {
             return ISegmentProgressBarRef();
         }
@@ -292,7 +292,7 @@ public:
         aSegments.push_back( ISegmentProgressBarRef( new ProgressWrapper( xProgress ) ) );
         return aSegments.back();
     }
-    virtual void Timeout()
+    virtual void Timeout() SAL_OVERRIDE
     {
         for( size_t i = 0; i < aSegments.size(); i++)
             static_cast< ProgressWrapper *>( aSegments[ i ].get() )->UpdateBar();
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 2dceb6c6f891..a2abf59ce175 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -337,11 +337,11 @@ public:
     void finalizeDrawingImport();
 
     /// Allow the threaded importer to override our progress bar impl.
-    virtual ISegmentProgressBarRef getRowProgress()
+    virtual ISegmentProgressBarRef getRowProgress() SAL_OVERRIDE
     {
         return mxRowProgress;
     }
-    virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress )
+    virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) SAL_OVERRIDE
     {
         mxRowProgress = rxRowProgress;
         mbFastRowProgress = true;