From d1ab132367c6e4ce0ca5711b7c5259d1f6e0e5cc Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sat, 27 Apr 2019 23:53:02 +0200
Subject: tdf#42949 Fix IWYU warnings in  xmlsecurity/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

All hxx cleaned except the ones in
xmlsecurity/source/xmlsec/mscrypt

Change-Id: I651f53c9d339208b3132f9078a5c3829ff9c5dc8
Reviewed-on: https://gerrit.libreoffice.org/71448
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 xmlsecurity/source/gpg/CertificateImpl.hxx     |  4 ----
 xmlsecurity/source/gpg/CipherContext.hxx       |  2 --
 xmlsecurity/source/gpg/DigestContext.hxx       |  2 --
 xmlsecurity/source/gpg/SEInitializer.cxx       |  2 ++
 xmlsecurity/source/gpg/SecurityEnvironment.cxx | 13 +++++++++++++
 xmlsecurity/source/gpg/SecurityEnvironment.hxx | 17 ++---------------
 xmlsecurity/source/gpg/XMLEncryption.hxx       |  8 +++-----
 xmlsecurity/source/gpg/XMLSecurityContext.hxx  |  8 ++------
 8 files changed, 22 insertions(+), 34 deletions(-)

(limited to 'xmlsecurity/source/gpg')

diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx b/xmlsecurity/source/gpg/CertificateImpl.hxx
index e9839c31f013..cb947f0f435b 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -15,15 +15,11 @@
 #include <sal/types.h>
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
 
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/uno/SecurityException.hpp>
 #include <com/sun/star/security/CertificateKind.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 
diff --git a/xmlsecurity/source/gpg/CipherContext.hxx b/xmlsecurity/source/gpg/CipherContext.hxx
index 89eaf4646218..4e4e04cce917 100644
--- a/xmlsecurity/source/gpg/CipherContext.hxx
+++ b/xmlsecurity/source/gpg/CipherContext.hxx
@@ -11,8 +11,6 @@
 #define INCLUDED_XMLSECURITY_SOURCE_GPG_CIPHERCONTEXT_HXX
 
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/xmlsecurity/source/gpg/DigestContext.hxx b/xmlsecurity/source/gpg/DigestContext.hxx
index 41aa7cadd663..99fa264ef8d2 100644
--- a/xmlsecurity/source/gpg/DigestContext.hxx
+++ b/xmlsecurity/source/gpg/DigestContext.hxx
@@ -11,8 +11,6 @@
 #define INCLUDED_XMLSECURITY_SOURCE_GPG_DIGESTCONTEXT_HXX
 
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx
index 689d00f726c1..02104cf4e4c1 100644
--- a/xmlsecurity/source/gpg/SEInitializer.cxx
+++ b/xmlsecurity/source/gpg/SEInitializer.cxx
@@ -9,6 +9,8 @@
 
 #include <config_gpgme.h>
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include <cppuhelper/supportsservice.hxx>
 #include <gpg/SEInitializer.hxx>
 #include "SecurityEnvironment.hxx"
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 6ba1bced5cfa..99dc064ca6d2 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -12,6 +12,9 @@
 #include "SecurityEnvironment.hxx"
 #include "CertificateImpl.hxx"
 
+#include <com/sun/star/security/CertificateCharacters.hpp>
+#include <com/sun/star/security/CertificateValidity.hpp>
+
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <list>
@@ -28,6 +31,16 @@
 #include <keylistresult.h>
 #include <xmlsec-wrapper.h>
 
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gpgme.h>
+#if defined _MSC_VER && defined __clang__
+#pragma clang diagnostic pop
+#endif
+#include <context.h>
+
 using namespace css;
 using namespace css::security;
 using namespace css::uno;
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
index 00480824b72a..a8aacfa5a10b 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
@@ -12,27 +12,14 @@
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/SecurityException.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#include <com/sun/star/security/XCertificate.hpp>
-#include <com/sun/star/security/CertificateCharacters.hpp>
-#include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#if defined _MSC_VER && defined __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundef"
-#endif
-#include <gpgme.h>
-#if defined _MSC_VER && defined __clang__
-#pragma clang diagnostic pop
-#endif
-#include <context.h>
+namespace com::sun::star::security { class XCertificate; }
+namespace GpgME { class Context; }
 
 class SecurityEnvironmentGpg : public cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment,
                                                             css::lang::XUnoTunnel >
diff --git a/xmlsecurity/source/gpg/XMLEncryption.hxx b/xmlsecurity/source/gpg/XMLEncryption.hxx
index d9c6b508c666..168128b40a9c 100644
--- a/xmlsecurity/source/gpg/XMLEncryption.hxx
+++ b/xmlsecurity/source/gpg/XMLEncryption.hxx
@@ -11,15 +11,13 @@
 #define INCLUDED_XMLSECURITY_SOURCE_GPG_XMLENCRYPTION_HXX
 
 #include <sal/config.h>
-#include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
-#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
-#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#include <com/sun/star/xml/crypto/XMLEncryptionException.hpp>
+
+namespace com::sun::star::xml::crypto { class XXMLEncryptionTemplate; }
+namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
 
 class XMLEncryptionGpg : public cppu::WeakImplHelper< css::xml::crypto::XXMLEncryption >
 {
diff --git a/xmlsecurity/source/gpg/XMLSecurityContext.hxx b/xmlsecurity/source/gpg/XMLSecurityContext.hxx
index 4355cc0ce67a..3ca399f2be2d 100644
--- a/xmlsecurity/source/gpg/XMLSecurityContext.hxx
+++ b/xmlsecurity/source/gpg/XMLSecurityContext.hxx
@@ -12,20 +12,16 @@
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#include <com/sun/star/security/SecurityInfrastructureException.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 
 #include <vector>
 
+namespace com::sun::star::xml::crypto { class XSecurityEnvironment; }
+
 class XMLSecurityContextGpg : public cppu::WeakImplHelper< css::xml::crypto::XXMLSecurityContext,
                                                            css::lang::XServiceInfo>
 {
-- 
cgit