From 57634a88ce9c3f1723243c7880c42a37cbe45169 Mon Sep 17 00:00:00 2001
From: Vasily Melenchuk <vasily.melenchuk@cib.de>
Date: Fri, 29 Nov 2019 11:57:51 +0300
Subject: oox: fixes for cang errors after refactoring:

Change-Id: I6c0ff55e3a6d3edbac78aa6e806da4a290af142d
---
 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(-)

diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 362125ed36f9..b2e9d7375634 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -35,10 +35,10 @@ namespace crypto {
 class 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 0cf3a1e3db95..1e6986441f4f 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 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>
-- 
cgit