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

5 files changed, 40 insertions, 40 deletions

diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 6ad33a3dcf8b..110c1ff8f895 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -293,19 +293,19 @@ public:
 
     /** Closes the input stream. Does also close the wrapped UNO input stream
         if bAutoClose has been set to true in the constructor. */
-    virtual void        close();
+    virtual void        close() SAL_OVERRIDE;
 
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. */
-    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
@@ -338,15 +338,15 @@ public:
 
     /** Reads nBytes bytes to the passed sequence.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Reads nBytes bytes to the (existing) buffer opMem.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. */
-    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
@@ -387,31 +387,31 @@ public:
 
     /** Returns the size of the data block in the wrapped stream offered by
         this wrapper. */
-    virtual sal_Int64   size() const;
+    virtual sal_Int64   size() const SAL_OVERRIDE;
 
     /** Returns the current relative stream position. */
-    virtual sal_Int64   tell() const;
+    virtual sal_Int64   tell() const SAL_OVERRIDE;
 
     /** Seeks the stream to the passed relative position, if the wrapped stream
         is seekable. */
-    virtual void        seek( sal_Int64 nPos );
+    virtual void        seek( sal_Int64 nPos ) SAL_OVERRIDE;
 
     /** Closes the input stream but not the wrapped stream. */
-    virtual void        close();
+    virtual void        close() SAL_OVERRIDE;
 
     /** Reads nBytes bytes to the passed sequence. Does not read out of the
         data block whose size has been specified on construction.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Reads nBytes bytes to the (existing) buffer opMem. Does not read out of
         the data block whose size has been specified on construction.
         @return  Number of bytes really read. */
-    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual sal_Int32   readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Seeks the stream forward by the passed number of bytes. This works for
         non-seekable streams too. Does not seek out of the data block. */
-    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual void        skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Stream operator for all data types supported by the readValue() function. */
     template< typename Type >
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 007a7e8e7865..fe8d5e0c5d0a 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -126,13 +126,13 @@ public:
 
     /** Flushes and closes the output stream. Does also close the wrapped UNO
         output stream if bAutoClose has been set to true in the constructor. */
-    void                close();
+    void                close() SAL_OVERRIDE;
 
     /** Writes the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 );
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Write nBytes bytes from the (preallocated!) buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
@@ -170,10 +170,10 @@ public:
     explicit            SequenceOutputStream( StreamDataSequence& rData );
 
     /** Writes the passed data sequence. */
-    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 );
+    virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Write nBytes bytes from the (preallocated!) buffer pMem. */
-    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 );
+    virtual void        writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE;
 
     /** Stream operator for all data types supported by the writeValue() function. */
     template< typename Type >
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 0f794ede13b0..fc7f3c39bc0e 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -132,13 +132,13 @@ public:
     virtual             ~BinaryXSeekableStream();
 
     /** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */
-    virtual sal_Int64   size() const;
+    virtual sal_Int64   size() const SAL_OVERRIDE;
     /** Returns the current stream position, if wrapped stream is seekable, otherwise -1. */
-    virtual sal_Int64   tell() const;
+    virtual sal_Int64   tell() const SAL_OVERRIDE;
     /** Seeks the stream to the passed position, if wrapped stream is seekable. */
-    virtual void        seek( sal_Int64 nPos );
+    virtual void        seek( sal_Int64 nPos ) SAL_OVERRIDE;
     /** Releases the reference to the UNO XSeekable interface. */
-    virtual void        close();
+    virtual void        close() SAL_OVERRIDE;
 
 protected:
     explicit            BinaryXSeekableStream(
@@ -162,13 +162,13 @@ class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase
 {
 public:
     /** Returns the size of the wrapped data sequence. */
-    virtual sal_Int64   size() const;
+    virtual sal_Int64   size() const SAL_OVERRIDE;
     /** Returns the current stream position. */
-    virtual sal_Int64   tell() const;
+    virtual sal_Int64   tell() const SAL_OVERRIDE;
     /** Seeks the stream to the passed position. */
-    virtual void        seek( sal_Int64 nPos );
+    virtual void        seek( sal_Int64 nPos ) SAL_OVERRIDE;
     /** Releases the reference to the data sequence. */
-    virtual void        close();
+    virtual void        close() SAL_OVERRIDE;
 
 protected:
     explicit            SequenceSeekableStream( const StreamDataSequence& rData );
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index ce08a6beccfd..e671d42deb6d 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -93,9 +93,9 @@ public:
     virtual             ~ProgressBar();
 
     /** Returns the current position of the progress bar. */
-    virtual double      getPosition() const;
+    virtual double      getPosition() const SAL_OVERRIDE;
     /** Sets the current position of the progress bar. */
-    virtual void        setPosition( double fPosition );
+    virtual void        setPosition( double fPosition ) SAL_OVERRIDE;
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >
@@ -115,14 +115,14 @@ public:
                             const OUString& rText );
 
     /** Returns the current position of the progress bar segment. */
-    virtual double      getPosition() const;
+    virtual double      getPosition() const SAL_OVERRIDE;
     /** Sets the current position of the progress bar segment. */
-    virtual void        setPosition( double fPosition );
+    virtual void        setPosition( double fPosition ) SAL_OVERRIDE;
 
     /** Returns the length that is still free for creating sub segments. */
-    virtual double      getFreeLength() const;
+    virtual double      getFreeLength() const SAL_OVERRIDE;
     /** Adds a new segment with the specified length. */
-    virtual ISegmentProgressBarRef createSegment( double fLength );
+    virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE;
 
 private:
     ProgressBar         maProgress;
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index e3e544bcca33..f643935bb006 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -51,28 +51,28 @@ private:
                             const OUString& rElementName );
 
     /** Returns true, if the object represents a valid storage. */
-    virtual bool        implIsStorage() const;
+    virtual bool        implIsStorage() const SAL_OVERRIDE;
 
     /** Returns the com.sun.star.embed.XStorage interface of the current storage. */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
-                        implGetXStorage() const;
+                        implGetXStorage() const SAL_OVERRIDE;
 
     /** Returns the names of all elements of this storage. */
-    virtual void        implGetElementNames( ::std::vector< OUString >& orElementNames ) const;
+    virtual void        implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE;
 
     /** Opens and returns the specified sub storage from the storage. */
-    virtual StorageRef  implOpenSubStorage( const OUString& rElementName, bool bCreateMissing );
+    virtual StorageRef  implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE;
 
     /** Opens and returns the specified input stream from the storage. */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-                        implOpenInputStream( const OUString& rElementName );
+                        implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE;
 
     /** Opens and returns the specified output stream from the storage. */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
-                        implOpenOutputStream( const OUString& rElementName );
+                        implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE;
 
     /** Commits the current storage. */
-    virtual void        implCommit() const;
+    virtual void        implCommit() const SAL_OVERRIDE;
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >