diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /include/oox/crypto | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
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
Diffstat (limited to 'include/oox/crypto')
| -rw-r--r-- | include/oox/crypto/AgileEngine.hxx | 8 | ||||
| -rw-r--r-- | include/oox/crypto/CryptTools.hxx | 4 | ||||
| -rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index 4ca67edfaf69..e2cda6e4f88c 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -61,17 +61,17 @@ public: virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream); + BinaryXOutputStream& rStream) SAL_OVERRIDE; - virtual bool generateEncryptionKey(const OUString& rPassword); + virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; }; } // namespace core diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index dde778d4df8c..a724f64ff218 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -95,7 +95,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0); + sal_uInt32 inputLength = 0) SAL_OVERRIDE; static sal_uInt32 aes128ecb( @@ -114,7 +114,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0); + sal_uInt32 inputLength = 0) SAL_OVERRIDE; }; class Digest diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 329d790a69cf..366eabc690cd 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -92,19 +92,19 @@ public: StandardEncryptionInfo& getInfo(); - virtual bool generateEncryptionKey(const OUString& rPassword); + virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream); + BinaryXOutputStream& rStream) SAL_OVERRIDE; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; }; |