include/oox/crypto/AgileEngine.hxx | 16 ++++++++-------- include/oox/crypto/Standard2007Engine.hxx | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 1020418de18f75bead0e89ced8170807bf704159 Author: Serge Krot <[email protected]> AuthorDate: Thu Oct 10 10:01:16 2019 +0200 Commit: Serge Krot (CIB) <[email protected]> CommitDate: Thu Oct 10 10:06:54 2019 +0200 Fix compilation: SAL_CALL is missing in method declaration Change-Id: I4fc5e2de894a523d2a222ad9e7e04e1f1c01b9c5 Reviewed-on: https://gerrit.libreoffice.org/80590 Reviewed-by: Serge Krot (CIB) <[email protected]> Tested-by: Serge Krot (CIB) <[email protected]> diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index 3a8b49e21de8..39f8103a6a03 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -131,24 +131,24 @@ public: // Decryption - sal_Bool generateEncryptionKey(const OUString & rPassword) override; - sal_Bool readEncryptionInfo(const css::uno::Sequence<css::beans::NamedValue>& aStreams) override; - sal_Bool decrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + virtual sal_Bool SAL_CALL generateEncryptionKey(const OUString & rPassword) override; + virtual sal_Bool SAL_CALL readEncryptionInfo(const css::uno::Sequence<css::beans::NamedValue>& aStreams) override; + virtual sal_Bool SAL_CALL decrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, css::uno::Reference<css::io::XOutputStream>& rxOutputStream) override; - sal_Bool checkDataIntegrity() override; + virtual sal_Bool SAL_CALL checkDataIntegrity() override; // Encryption - css::uno::Sequence<css::beans::NamedValue> writeEncryptionInfo() override; + virtual css::uno::Sequence<css::beans::NamedValue> SAL_CALL writeEncryptionInfo() override; - void encrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + virtual void SAL_CALL encrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, css::uno::Reference<css::io::XOutputStream>& rxOutputStream) override; - sal_Bool setupEncryption(const css::uno::Sequence<css::beans::NamedValue>& rMediaEncData) override; + virtual sal_Bool SAL_CALL setupEncryption(const css::uno::Sequence<css::beans::NamedValue>& rMediaEncData) override; - css::uno::Sequence<css::beans::NamedValue> createEncryptionData(const OUString& rPassword) override; + virtual css::uno::Sequence<css::beans::NamedValue> SAL_CALL createEncryptionData(const OUString& rPassword) override; }; } // namespace core diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index d853f4e1a1af..e838d7b064d3 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -41,24 +41,24 @@ public: // Decryption - sal_Bool generateEncryptionKey(const OUString & rPassword) override; - sal_Bool readEncryptionInfo(const css::uno::Sequence<css::beans::NamedValue>& aStreams) override; - sal_Bool decrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + virtual sal_Bool SAL_CALL generateEncryptionKey(const OUString & rPassword) override; + virtual sal_Bool SAL_CALL readEncryptionInfo(const css::uno::Sequence<css::beans::NamedValue>& aStreams) override; + virtual sal_Bool SAL_CALL decrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, css::uno::Reference<css::io::XOutputStream>& rxOutputStream) override; - sal_Bool checkDataIntegrity() override; + virtual sal_Bool SAL_CALL checkDataIntegrity() override; // Encryption - css::uno::Sequence<css::beans::NamedValue> writeEncryptionInfo() override; + virtual css::uno::Sequence<css::beans::NamedValue> SAL_CALL writeEncryptionInfo() override; - void encrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, + virtual void SAL_CALL encrypt(const css::uno::Reference<css::io::XInputStream>& rxInputStream, css::uno::Reference<css::io::XOutputStream>& rxOutputStream) override; - sal_Bool setupEncryption(const css::uno::Sequence<css::beans::NamedValue>& rMediaEncData) override; + virtual sal_Bool SAL_CALL setupEncryption(const css::uno::Sequence<css::beans::NamedValue>& rMediaEncData) override; - css::uno::Sequence<css::beans::NamedValue> createEncryptionData(const OUString& rPassword) override; + virtual css::uno::Sequence<css::beans::NamedValue> SAL_CALL createEncryptionData(const OUString& rPassword) override; }; } // namespace core _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
