diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/oox/crypto | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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 d1feb8619689..dc9c36d8f1db 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) SAL_OVERRIDE; + BinaryXOutputStream& rStream) override; - virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; + virtual bool generateEncryptionKey(const OUString& rPassword) override; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; }; } // namespace core diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index c1602af7c25b..eaf531f4d439 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_OVERRIDE; + sal_uInt32 inputLength = 0) 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_OVERRIDE; + sal_uInt32 inputLength = 0) override; }; class Digest diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 2d76bee8942c..5e5a6fc36bff 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -92,19 +92,19 @@ public: StandardEncryptionInfo& getInfo() { return mInfo;} - virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; + virtual bool generateEncryptionKey(const OUString& rPassword) override; virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream) SAL_OVERRIDE; + BinaryXOutputStream& rStream) override; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; }; |