From d1ab132367c6e4ce0ca5711b7c5259d1f6e0e5cc Mon Sep 17 00:00:00 2001 From: Gabor Kelemen 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 --- .../source/component/documentdigitalsignatures.cxx | 2 ++ xmlsecurity/source/dialogs/certificatechooser.cxx | 1 + xmlsecurity/source/framework/buffernode.hxx | 5 +++-- xmlsecurity/source/framework/elementcollector.cxx | 1 + xmlsecurity/source/framework/elementcollector.hxx | 4 +++- xmlsecurity/source/framework/elementmark.hxx | 1 - xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 2 ++ xmlsecurity/source/framework/signaturecreatorimpl.cxx | 2 ++ xmlsecurity/source/framework/signatureverifierimpl.cxx | 2 ++ .../source/framework/xmlsignaturetemplateimpl.cxx | 1 - 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 ++------ xmlsecurity/source/helper/documentsignaturehelper.cxx | 1 + xmlsecurity/source/helper/documentsignaturemanager.cxx | 3 +++ xmlsecurity/source/helper/ooxmlsecexporter.cxx | 1 + xmlsecurity/source/helper/ooxmlsecparser.cxx | 1 + xmlsecurity/source/helper/ooxmlsecparser.hxx | 5 ++--- xmlsecurity/source/helper/xsecctl.cxx | 2 ++ xmlsecurity/source/helper/xsecparser.cxx | 1 + xmlsecurity/source/helper/xsecparser.hxx | 7 +++---- .../source/xmlsec/certificateextension_xmlsecimpl.hxx | 4 ---- xmlsecurity/source/xmlsec/errorcallback.cxx | 1 + xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 1 + xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 3 ++- xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 3 ++- xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 5 ----- xmlsecurity/source/xmlsec/nss/secerror.hxx | 2 +- .../source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6 +++++- .../source/xmlsec/nss/securityenvironment_nssimpl.hxx | 16 +++++----------- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 5 ++--- .../source/xmlsec/nss/x509certificate_nssimpl.cxx | 1 + .../source/xmlsec/nss/x509certificate_nssimpl.hxx | 6 ++---- .../source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 3 +-- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 3 +-- xmlsecurity/source/xmlsec/saxhelper.cxx | 4 +++- .../source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 1 + .../source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 5 ----- xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2 ++ 44 files changed, 82 insertions(+), 87 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index e27181d95129..43b74580d472 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include #include diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 757c2008803d..deaead487768 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx index 356e52bc33df..1b8e6f8574e9 100644 --- a/xmlsecurity/source/framework/buffernode.hxx +++ b/xmlsecurity/source/framework/buffernode.hxx @@ -20,12 +20,13 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_BUFFERNODE_HXX #define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_BUFFERNODE_HXX -#include -#include +#include #include #include +namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; } + class ElementMark; class ElementCollector; diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx index a4b045dbe4ec..48399fc8cc77 100644 --- a/xmlsecurity/source/framework/elementcollector.cxx +++ b/xmlsecurity/source/framework/elementcollector.cxx @@ -22,6 +22,7 @@ #include "elementcollector.hxx" #include "buffernode.hxx" #include +#include namespace cssu = com::sun::star::uno; namespace cssxc = com::sun::star::xml::crypto; diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx index 80e021a09e75..8af12f246b60 100644 --- a/xmlsecurity/source/framework/elementcollector.hxx +++ b/xmlsecurity/source/framework/elementcollector.hxx @@ -21,8 +21,10 @@ #define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTCOLLECTOR_HXX #include "elementmark.hxx" -#include #include +#include + +namespace com::sun::star::xml::crypto::sax { class XReferenceResolvedListener; } class ElementCollector : public ElementMark /****** elementcollector.hxx/CLASS ElementCollector *************************** diff --git a/xmlsecurity/source/framework/elementmark.hxx b/xmlsecurity/source/framework/elementmark.hxx index 2e7527d80d3a..8697a9de8876 100644 --- a/xmlsecurity/source/framework/elementmark.hxx +++ b/xmlsecurity/source/framework/elementmark.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTMARK_HXX #define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTMARK_HXX -#include #include class BufferNode; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 5358230f7a46..03fe79ce88fc 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 8289440b8b1e..2d828e47fe25 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -19,11 +19,13 @@ #include +#include #include #include #include #include #include +#include using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 30e7b8fab1d4..a5bd86192305 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -19,11 +19,13 @@ #include +#include #include #include #include #include #include +#include namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 75da61a9a59f..308ff78a6f22 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star::uno ; using ::com::sun::star::lang::XMultiServiceFactory ; -using ::com::sun::star::lang::XSingleServiceFactory ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ; 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 #include #include -#include #include -#include -#include #include #include #include -#include #include #include 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 -#include -#include #include 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 -#include -#include #include 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 +#include + #include #include #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 +#include + #include #include #include @@ -28,6 +31,16 @@ #include #include +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wundef" +#endif +#include +#if defined _MSC_VER && defined __clang__ +#pragma clang diagnostic pop +#endif +#include + 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 #include -#include #include -#include #include -#include #include -#include -#include -#include #include -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wundef" -#endif -#include -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif -#include +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 -#include #include -#include #include #include -#include -#include -#include + +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 #include -#include #include -#include #include -#include #include -#include -#include -#include #include #include +namespace com::sun::star::xml::crypto { class XSecurityEnvironment; } + class XMLSecurityContextGpg : public cppu::WeakImplHelper< css::xml::crypto::XXMLSecurityContext, css::lang::XServiceInfo> { diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 0b197abc8efe..abbfd617c9f3 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 65d691052348..8ca9f07f4d64 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -31,6 +32,8 @@ #include #include #include +#include +#include #include #include diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index 1518b8b4e092..062c76d5c47b 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index 457ef66bf24b..c22e8c2261bf 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -10,6 +10,7 @@ #include "ooxmlsecparser.hxx" #include +#include #include using namespace com::sun::star; diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index b425e4c32a0f..d3c199147255 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -10,14 +10,13 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_OOXMLSECPARSER_HXX #define INCLUDED_XMLSECURITY_SOURCE_HELPER_OOXMLSECPARSER_HXX -#include #include #include -#include #include -#include +class XSecController; +class XMLSignatureHelper; /// Parses an OOXML digital signature. class OOXMLSecParser: public cppu::WeakImplHelper diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 56d354572a41..f4ff8a156f47 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include #include diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index 532ba07a0298..f87aec62f21d 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -19,6 +19,7 @@ #include "xsecparser.hxx" +#include #include #include #include diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 42b63975ecb9..d9b079aa3116 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -20,15 +20,14 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX #define INCLUDED_XMLSECURITY_SOURCE_HELPER_XSECPARSER_HXX -#include - -#include #include #include -#include #include +class XMLSignatureHelper; +class XSecController; + class XSecParser: public cppu::WeakImplHelper < css::xml::sax::XDocumentHandler, diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index 3dbcbd0c1eb3..11e9a04707d7 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -21,11 +21,7 @@ #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_CERTIFICATEEXTENSION_XMLSECIMPL_HXX #include -#include -#include #include -#include -#include #include #include "certificateextension_certextn.hxx" diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 3cbe0ac1142e..c621c1bf715c 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -21,6 +21,7 @@ #include +#include #include #ifdef _WIN32 diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index c0465cfb8e3d..af114619e7f9 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -25,6 +25,7 @@ #include #include "ciphercontext.hxx" +#include using namespace ::com::sun::star; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx index a7a4e6dad54e..1d4a99c309c8 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx @@ -24,7 +24,8 @@ #include #include -#include +#include +#include class OCipherContext : public cppu::WeakImplHelper< css::xml::crypto::XCipherContext > { diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index 28a4ffd2af1d..7e1b7ff50537 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -22,10 +22,11 @@ #include #include -#include #include +namespace com::sun::star::uno { class XComponentContext; } + #define NSS_SERVICE_NAME "com.sun.star.xml.crypto.NSSInitializer" class ONSSInitializer : public cppu::WeakImplHelper diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index 95b4c357ceeb..857aa6cc42ff 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -21,12 +21,7 @@ #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX #include -#include -#include #include -#include -#include -#include #include #include #include diff --git a/xmlsecurity/source/xmlsec/nss/secerror.hxx b/xmlsecurity/source/xmlsec/nss/secerror.hxx index 8d4b0294efe8..9de7f5af7cdd 100644 --- a/xmlsecurity/source/xmlsec/nss/secerror.hxx +++ b/xmlsecurity/source/xmlsec/nss/secerror.hxx @@ -23,7 +23,7 @@ #include #include -#include +#include const char * getCertError(PRErrorCode errNum); diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 3a1001b7447c..c64b69c2002e 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -41,18 +41,22 @@ #include #include +#include "x509certificate_nssimpl.hxx" #include "secerror.hxx" #include +#include // added for password exception #include +#include +#include + namespace csss = ::com::sun::star::security; using namespace ::com::sun::star::security; using namespace com::sun::star; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; -using ::com::sun::star::lang::XSingleServiceFactory ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::security::XCertificate ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index a273f0a8bb4c..058f990edb99 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -22,32 +22,26 @@ #include #include -#include #include -#include #include -#include #include #include #include -#include -#include -#include #include -#include "x509certificate_nssimpl.hxx" - #include -#include -#include -#include +#include +#include #include #include +namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } } +class X509Certificate_NssImpl; + class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper< css::xml::crypto::XSecurityEnvironment, css::xml::crypto::XCertificateCreator, diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index 7eda9a259677..ec6742529306 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -20,15 +20,14 @@ #ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SEINITIALIZER_NSSIMPL_HXX #define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SEINITIALIZER_NSSIMPL_HXX -#include #include #include -#include - #include "nssinitializer.hxx" +namespace com::sun::star::xml::crypto { class XXMLSecurityContext; } + class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper < ONSSInitializer, diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 180ef6558d38..6154f6548545 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index cae1f7238739..35cd393f2034 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -22,17 +22,15 @@ #include #include -#include #include -#include #include #include -#include #include #include #include -#include +#include +#include class X509Certificate_NssImpl : public ::cppu::WeakImplHelper< css::security::XCertificate , diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index b894cd098330..ce01a0a40407 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -23,11 +23,10 @@ #include #include "securityenvironment_nssimpl.hxx" #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::lang ; -using ::com::sun::star::lang::XMultiServiceFactory ; -using ::com::sun::star::lang::XSingleServiceFactory ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::xml::crypto::XXMLSecurityContext ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index a5d8739aa48b..1f5256d22383 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -29,13 +29,12 @@ #include #include +#include #include using namespace ::com::sun::star; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; -using ::com::sun::star::lang::XMultiServiceFactory ; -using ::com::sun::star::lang::XSingleServiceFactory ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 091773992324..bf3c39127c44 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -23,12 +23,14 @@ #include #include +#include +#include + #ifndef XMLSEC_NO_XSLT #include "libxslt/xslt.h" #endif namespace cssu = com::sun::star::uno; -namespace cssxs = com::sun::star::xml::sax; namespace cssxcsax = com::sun::star::xml::csax; /** diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index de0cd43f3c8f..ba6f9f807dfe 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include "xmlelementwrapper_xmlsecimpl.hxx" diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 27940e73c61b..35c584203b63 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -22,17 +22,12 @@ #include #include -#include #include #include #include #include -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - class XSECXMLSEC_DLLPUBLIC XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper < css::xml::wrapper::XXMLElementWrapper, diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 5b1b0212073c..3c61084ad6ef 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -27,6 +27,8 @@ #include #include +#include + #include #include -- cgit