summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/xmlsec
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-05-03 21:19:07 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-05-09 08:58:28 +0200
commit64faea31f7d05e46fe5c91f87381ec7abae90174 (patch)
treef34dd5e5f58c865cf6e9cee9fc41554ee0441d52 /xmlsecurity/source/xmlsec
parentd7082ab8028e291ccbbdebe8e075d0a6e05af460 (diff)
tdf#42949 Fix IWYU warnings in xmlsecurity/*cxx
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I89c77656ea4021cb16bd122cb1dd1cd803390c3d Reviewed-on: https://gerrit.libreoffice.org/71765 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmlsecurity/source/xmlsec')
-rw-r--r--xmlsecurity/source/xmlsec/nss/digestcontext.hxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx9
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/nss/secerror.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx7
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx6
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx8
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/xmlsec_init.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.cxx1
13 files changed, 13 insertions, 45 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index a8aafdefeec3..2f41862a815d 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -24,6 +24,7 @@
#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
+#include <secmodt.h>
class ODigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigestContext >
{
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 688a94d31a5e..d77e2d4a4fcb 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -28,28 +28,25 @@
#include <rtl/instance.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
#include <sal/log.hxx>
#include <unotools/tempfile.hxx>
#include <salhelper/singletonref.hxx>
-#include "seinitializer_nssimpl.hxx"
+#include <nss/nssinitializer.hxx>
-#include "securityenvironment_nssimpl.hxx"
#include "digestcontext.hxx"
#include "ciphercontext.hxx"
#include <memory>
#include <vector>
-#include <nspr.h>
-#include <cert.h>
#include <nss.h>
#include <pk11pub.h>
#include <secmod.h>
-#include <nssckbi.h>
+#include <prerror.h>
+#include <prinit.h>
namespace cssu = css::uno;
namespace cssl = css::lang;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index 4b14a35e0251..37602b6e03ce 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <rtl/uuid.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/security/ExtAltNameType.hpp>
#include <com/sun/star/security/CertAltNameEntry.hpp>
@@ -27,8 +26,6 @@
#include <seccomon.h>
#include <cert.h>
#include <certt.h>
-#include <secitem.h>
-#include <secport.h>
#include "sanextension_nssimpl.hxx"
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx
index 717dd32a535a..2b3438a356f6 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.cxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx
@@ -20,13 +20,9 @@
#include <secerr.h>
#include "secerror.hxx"
-#include <sslerr.h>
-#include <nspr.h>
#include <nss.h>
#include <certt.h>
#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/types.h>
struct ErrDesc {
PRErrorCode const errNum;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 03ad4c11487e..d67bf2e517e4 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -33,7 +33,6 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/docpasswordrequest.hxx>
-#include <biginteger.hxx>
#include <sal/log.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <vector>
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 4143a320dae5..7795d76a1ed2 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -18,11 +18,6 @@
*/
#include <sal/types.h>
-#include <rtl/bootstrap.hxx>
-#include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <osl/thread.h>
#include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
#include <cppuhelper/supportsservice.hxx>
@@ -30,12 +25,7 @@
#include "seinitializer_nssimpl.hxx"
#include "securityenvironment_nssimpl.hxx"
-#include <nspr.h>
#include <cert.h>
-#include <nss.h>
-#include <pk11pub.h>
-#include <secmod.h>
-#include <nssckbi.h>
namespace cssxc = css::xml::crypto;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 6154f6548545..fb68b0cac410 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -18,14 +18,12 @@
*/
#include "nssrenam.h"
-#include <nspr.h>
-#include <nss.h>
#include <secder.h>
#include <cert.h>
#include <hasht.h>
#include <secoid.h>
-#include <pk11func.h>
+#include <pk11pub.h>
#include <sal/config.h>
#include <comphelper/servicehelper.hxx>
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index ce01a0a40407..1ed575e92300 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -19,11 +19,12 @@
#include <sal/config.h>
#include <vector>
-#include <rtl/uuid.h>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include "securityenvironment_nssimpl.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 1f5256d22383..7ad39d3a765a 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -18,9 +18,7 @@
*/
#include <sal/config.h>
-#include <rtl/uuid.h>
-#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
#include <xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmlstreamio.hxx>
#include <xmlsec/errorcallback.hxx>
@@ -29,15 +27,15 @@
#include <xmlsec-wrapper.h>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
+namespace com::sun::star::uno { class XComponentContext; }
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
-using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ;
using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
using ::com::sun::star::xml::crypto::XXMLSignature ;
using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ;
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index ba6f9f807dfe..b8479fc5afae 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -28,14 +28,6 @@
#include <xmloff/attrlist.hxx>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <vector>
-
#ifdef UNX
#define stricmp strcasecmp
#endif
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 4f9e8c8047e6..60b9714256b7 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -20,10 +20,11 @@
#include <string.h>
#include "xmlelementwrapper_xmlsecimpl.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
+namespace com::sun::star::uno { class XComponentContext; }
+
using namespace com::sun::star;
XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode)
diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
index 93dc49e6c126..6dcc45996536 100644
--- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx
+++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
@@ -13,7 +13,6 @@
#include <xmlsec/xmlstreamio.hxx>
#include <xmlsec-wrapper.h>
-#include <svl/cryptosign.hxx>
#ifdef XMLSEC_CRYPTO_MSCRYPTO
#include <xmlsec/mscng/crypto.h>
#else
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 3c61084ad6ef..0f8918380855 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
-#include <libxml/uri.h>
#include <xmlsec-wrapper.h>
static bool g_bInputCallbacksEnabled = false;