include/oox/crypto/DocumentDecryption.hxx | 2 +- include/oox/crypto/DocumentEncryption.hxx | 3 ++- include/oox/crypto/StrongEncryptionDataSpace.hxx | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit bd3c2c397e24eafdeebacf7a8d0a718f5297361c Author: Vasily Melenchuk <[email protected]> AuthorDate: Fri Nov 29 11:57:51 2019 +0300 Commit: Vasily Melenchuk <[email protected]> CommitDate: Fri Nov 29 11:57:51 2019 +0300 oox: fixes for cang errors after refactoring: Change-Id: I6c0ff55e3a6d3edbac78aa6e806da4a290af142d diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index d1754c791a4a..d188336a07d6 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -35,10 +35,10 @@ namespace crypto { class OOX_DLLPUBLIC DocumentDecryption { private: + css::uno::Reference< css::uno::XComponentContext > mxContext; oox::ole::OleStorage& mrOleStorage; css::uno::Sequence<css::beans::NamedValue> maStreamsSequence; css::uno::Reference< css::packages::XPackageEncryption > mxPackageEncryption; - css::uno::Reference< css::uno::XComponentContext > mxContext; public: DocumentDecryption(const css::uno::Reference< css::uno::XComponentContext >& rxContext, oox::ole::OleStorage& rOleStorage); diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx index f87eaac8342c..2172c842deb6 100644 --- a/include/oox/crypto/DocumentEncryption.hxx +++ b/include/oox/crypto/DocumentEncryption.hxx @@ -20,6 +20,7 @@ namespace com { namespace sun { namespace star { namespace io { class XStream; } namespace packages { class XPackageEncryption; } + namespace beans { struct NamedValue; } } } } namespace oox { namespace ole { class OleStorage; } } @@ -30,11 +31,11 @@ namespace crypto { class OOX_DLLPUBLIC DocumentEncryption { private: + css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::io::XStream > mxDocumentStream; oox::ole::OleStorage& mrOleStorage; css::uno::Reference< css::packages::XPackageEncryption > mxPackageEncryption; const css::uno::Sequence< css::beans::NamedValue >& mMediaEncData; - css::uno::Reference< css::uno::XComponentContext > mxContext; public: DocumentEncryption(const css::uno::Reference< css::uno::XComponentContext >& rxContext, diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx index d3eb76a2c1a8..966185c94612 100644 --- a/include/oox/crypto/StrongEncryptionDataSpace.hxx +++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx @@ -12,6 +12,7 @@ #define INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX #include <oox/dllapi.h> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/packages/XPackageEncryption.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <oox/crypto/CryptoEngine.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
