tdf#42949: clean up includes in include/oox/crypto with iwyu

The includes in CryptTools.hxx that are within #if/#endif directives
are not altered. iwyu suggested replacing the includes for nss.h,
pk11pub.h, and sechash.h with hasht.h, pkcs11t.h, seccomon.h,
and secmodt.h. I decided not to because it might make CryptTools.hxx
harder to refactor in exchange for little gain.

Before creating this commit, I ran 'make check' after passing
--with-tls=openssl to ./autogen.sh to ensure that building with
either OpenSSL or NSS (the default except on iOS and Android) works.

Change-Id: I20260d18f073ffd8077bbcc597e7a8e4954e2ec5
Reviewed-on: https://gerrit.libreoffice.org/24386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

5 files changed, 20 insertions, 3 deletions

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index a3cd57606e8e..066a3d6432c6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -44,6 +44,7 @@
 #include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/helper/zipstorage.hxx"
+#include <oox/ole/olestorage.hxx>
 #include <oox/token/namespaces.hxx>
 #include "oox/token/properties.hxx"
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index 13780868cd55..3897b877b294 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -10,6 +10,9 @@
 
 #include "oox/crypto/AgileEngine.hxx"
 
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
+
 namespace oox {
 namespace core {
 
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index a57b5671063d..eea0c629d641 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -15,11 +15,17 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
+#include <oox/crypto/AgileEngine.hxx>
+#include <oox/crypto/Standard2007Engine.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
+#include <oox/ole/olestorage.hxx>
 
 namespace oox {
 namespace core {
diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx
index cd6527aa95a2..1c328fccd775 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -10,15 +10,18 @@
 
 #include "oox/crypto/DocumentEncryption.hxx"
 
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/binaryoutputstream.hxx"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
+#include <oox/ole/olestorage.hxx>
 
 namespace oox {
 namespace core {
 
-using namespace css::beans;
 using namespace css::io;
 using namespace css::lang;
 using namespace css::uno;
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 0280a174b1a1..34fa2265a719 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -10,7 +10,11 @@
 
 #include "oox/crypto/Standard2007Engine.hxx"
 
+#include <oox/crypto/CryptTools.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
 #include <osl/time.h>
+#include <rtl/digest.h>
 #include <rtl/random.h>
 
 namespace oox {