Kaydet (Commit) d1ab1323 authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

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: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst b9b93004
......@@ -4,3 +4,112 @@ blacklist:
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx:
# complete type is needed
- com/sun/star/security/DocumentSignatureInformation.hpp
xmlsecurity/inc/xmlsignaturehelper2.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XUriBinding.hpp
xmlsecurity/inc/xsecctl.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.hpp
- com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp
- com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp
# Needed on WIN32 for rtl::Reference<UriBindingHelper> to compile
- xmlsignaturehelper2.hxx
xmlsecurity/inc/framework/securityengine.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XXMLSignature.hpp
- com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp
- com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp
xmlsecurity/inc/framework/signaturecreatorimpl.hxx:
# Base class needs complete type
- framework/signatureengine.hxx
- com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp
- com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/inc/framework/saxeventkeeperimpl.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.hpp
- com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp
- com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.hpp
- com/sun/star/xml/sax/XDocumentHandler.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/inc/framework/signatureverifierimpl.hxx:
# Base class needs complete type
- framework/signatureengine.hxx
- com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XInitialization.hpp
xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/inc/gpg/SEInitializer.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XSEInitializer.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XXMLSignature.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx:
# Base class needs complete type
- com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp
- com/sun/star/xml/csax/XCompressedDocumentHandler.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/source/gpg/CipherContext.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XCipherContext.hpp
xmlsecurity/source/gpg/DigestContext.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XDigestContext.hpp
xmlsecurity/source/gpg/CertificateImpl.hxx:
# Base class needs complete type
- com/sun/star/security/XCertificate.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/source/gpg/SecurityEnvironment.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XSecurityEnvironment.hpp
- com/sun/star/lang/XUnoTunnel.hpp
xmlsecurity/source/gpg/XMLSecurityContext.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XXMLSecurityContext.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/source/gpg/XMLEncryption.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XXMLEncryption.hpp
xmlsecurity/source/helper/ooxmlsecparser.hxx:
# Base class needs complete type
- com/sun/star/xml/sax/XDocumentHandler.hpp
- com/sun/star/lang/XInitialization.hpp
xmlsecurity/source/helper/xsecparser.hxx:
# Base class needs complete type
- com/sun/star/xml/sax/XDocumentHandler.hpp
- com/sun/star/lang/XInitialization.hpp
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx:
# Base class needs complete type
- com/sun/star/security/XCertificateExtension.hpp
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx:
# Base class needs complete type
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/xml/wrapper/XXMLElementWrapper.hpp
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx:
# Base class needs complete type
- com/sun/star/security/XSanExtension.hpp
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx:
# Base class needs complete type
- com/sun/star/security/XCertificate.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/lang/XServiceInfo.hpp
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx:
# Base class needs complete type
- nssinitializer.hxx
- com/sun/star/xml/crypto/XSEInitializer.hpp
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx:
# Base class needs complete type
- com/sun/star/xml/crypto/XSecurityEnvironment.hpp
- com/sun/star/xml/crypto/XCertificateCreator.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
......@@ -20,11 +20,7 @@
#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX
#define INCLUDED_XMLSECURITY_INC_CERTIFICATECHOOSER_HXX
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <svl/sigstruct.hxx>
#include <vcl/weld.hxx>
namespace com {
......@@ -36,6 +32,8 @@ namespace xml { namespace crypto {
class XSecurityEnvironment; }}
}}}
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
struct UserData
{
css::uno::Reference<css::security::XCertificate> xCertificate;
......
......@@ -21,10 +21,8 @@
#define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <rtl/ustring.hxx>
#include <svl/sigstruct.hxx>
#include "xmlsecuritydllapi.h"
#include <vector>
......@@ -37,6 +35,8 @@ namespace embed {
class XStorage; }
}}}
namespace com::sun::star::xml::sax { class XDocumentHandler; }
enum class DocumentSignatureMode
{
Content,
......
......@@ -28,6 +28,8 @@
#include "xmlsignaturehelper.hxx"
#include "documentsignaturehelper.hxx"
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
namespace com
{
namespace sun
......
......@@ -23,13 +23,9 @@
#include <com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.hpp>
#include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp>
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <xmlsecuritydllapi.h>
#include <cppuhelper/implbase.hxx>
......@@ -40,6 +36,10 @@ class ElementCollector;
#include <vector>
#include <memory>
namespace com::sun::star::xml::crypto::sax { class XSAXEventKeeperStatusChangeListener; }
namespace com::sun::star::xml::csax { class XCompressedDocumentHandler; }
namespace com::sun::star::xml::wrapper { class XXMLDocumentWrapper; }
class XMLSECURITY_DLLPUBLIC SAXEventKeeperImpl : public cppu::WeakImplHelper
<
css::xml::crypto::sax::XSecuritySAXEventKeeper,
......
......@@ -21,16 +21,16 @@
#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATURECREATORIMPL_HXX
#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/implbase.hxx>
#include <framework/signatureengine.hxx>
namespace com::sun::star::xml::crypto { class XSecurityEnvironment; }
namespace com::sun::star::xml::crypto::sax { class XSignatureCreationResultListener;}
typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
......
......@@ -21,26 +21,24 @@
#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREENGINE_HXX
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp>
#include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp>
#include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <xmlsecuritydllapi.h>
#include <framework/securityengine.hxx>
#include <framework/xmlsignaturetemplateimpl.hxx>
#include <vector>
namespace com::sun::star::io { class XInputStream; }
namespace com::sun::star::xml::crypto { class XXMLSignature; }
namespace rtl { template <class reference_type> class Reference; }
class XMLSignatureTemplateImpl;
class XMLSECURITY_DLLPUBLIC SignatureEngine : public cppu::ImplInheritanceHelper
<
SecurityEngine,
......
......@@ -20,18 +20,17 @@
#ifndef INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREVERIFIERIMPL_HXX
#define INCLUDED_XMLSECURITY_INC_FRAMEWORK_SIGNATUREVERIFIERIMPL_HXX
#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <xmlsecuritydllapi.h>
#include <framework/signatureengine.hxx>
namespace com::sun::star::xml::crypto::sax { class XSignatureVerifyResultListener; }
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
typedef cppu::ImplInheritanceHelper
<
SignatureEngine,
......
......@@ -22,19 +22,18 @@
#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/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <vector>
namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
css::xml::crypto::XXMLSignatureTemplate ,
css::lang::XServiceInfo >
......
......@@ -10,18 +10,16 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_GPG_SEINITIALIZER_HXX
#define INCLUDED_XMLSECURITY_SOURCE_GPG_SEINITIALIZER_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
#include <xsecxmlsecdllapi.h>
#include <cppuhelper/implbase.hxx>
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
class XSECXMLSEC_DLLPUBLIC SEInitializerGpg : public cppu::WeakImplHelper
<
css::xml::crypto::XSEInitializer,
......
......@@ -24,17 +24,17 @@
#include <rtl/ustring.hxx>
#include <xsecxmlsecdllapi.h>
#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/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
namespace com::sun::star::xml::crypto { class XXMLSignatureTemplate; }
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
class XSECXMLSEC_DLLPUBLIC XMLSignature_GpgImpl : public ::cppu::WeakImplHelper<
css::xml::crypto::XXMLSignature ,
......
......@@ -23,8 +23,6 @@
#include <vcl/weld.hxx>
#include <unotools/securityoptions.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
namespace com {
namespace sun {
namespace star {
......
......@@ -20,10 +20,6 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_ERRORCALLBACK_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_ERRORCALLBACK_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <xsecxmlsecdllapi.h>
// Only used for logging
......
......@@ -22,11 +22,10 @@
#include <libxml/tree.h>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/csax/XMLAttribute.hpp>
#include <rtl/ustring.hxx>
namespace com::sun::star::xml::csax { struct XMLAttribute; }
namespace com::sun::star::uno { template <typename > class Sequence; }
/** This class represents a SAX handler which simply forwards to
the corresponding libxml API and translates parameter if necessary.
......
......@@ -22,7 +22,6 @@
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>
#include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
......@@ -35,10 +34,6 @@
#include <libxml/tree.h>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
class XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper
<
css::xml::wrapper::XXMLDocumentWrapper,
......
......@@ -20,11 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
#include <xsecxmlsecdllapi.h>
namespace com::sun::star::xml::crypto { class XUriBinding; }
namespace com::sun::star::uno { template <typename > class Reference; }
XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks() ;
XSECXMLSEC_DLLPUBLIC void xmlDisableStreamInputCallbacks() ;
XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks(
......
......@@ -20,24 +20,16 @@
#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX
#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER_HXX
#include <vector>
#include <tools/link.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ref.hxx>
#include <svl/sigstruct.hxx>
#include "xsecctl.hxx"
#include "xmlsecuritydllapi.h"
#include "xmlsignaturehelper.hxx"
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/XWriter.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
class DateTime;
class UriBindingHelper;
class XSecController;
namespace com {
namespace sun {
......@@ -49,6 +41,12 @@ namespace embed {
class XStorage; }
}}}
namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com { namespace sun { namespace star { namespace xml { namespace crypto { class XXMLSecurityContext; } } } } }
namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } }
/**********************************************************
XMLSignatureHelper
......
......@@ -20,12 +20,11 @@
#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
#include <tools/link.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/XUriBinding.hpp>
namespace com {
namespace sun {
......
......@@ -22,25 +22,10 @@
#include <svl/sigstruct.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
#include <com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.hpp>
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/ref.hxx>
#include <cppuhelper/implbase.hxx>
......@@ -48,6 +33,16 @@
#include "xmlsignaturehelper2.hxx"
namespace com::sun::star::embed { class XStorage; }
namespace com::sun::star::graphic { class XGraphic; }
namespace com::sun::star::io { class XInputStream; }
namespace com::sun::star::lang { class XInitialization; }
namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::xml::crypto { class XXMLSecurityContext; }
namespace com::sun::star::xml::crypto { class XXMLSignature; }
namespace com::sun::star::xml::crypto:: sax { class XReferenceResolvedListener; }
namespace com::sun::star::xml::sax { class XDocumentHandler; }
#define NS_XMLDSIG "http://www.w3.org/2000/09/xmldsig#"
#define NS_DC "http://purl.org/dc/elements/1.1/"
#define NS_XD "http://uri.etsi.org/01903/v1.3.2#"
......@@ -66,7 +61,6 @@
#define ALGO_XMLDSIGSHA512 "http://www.w3.org/2001/04/xmlenc#sha512"
#define ALGO_RELATIONSHIP "http://schemas.openxmlformats.org/package/2006/RelationshipTransform"
class XSecParser;
class XMLDocumentWrapper_XmlSecImpl;
class SAXEventKeeperImpl;
class XMLSignatureHelper;
......
......@@ -45,6 +45,7 @@
#include <xmlsignaturehelper.hxx>
#include <documentsignaturemanager.hxx>
#include <certificate.hxx>
#include <xsecctl.hxx>
using namespace com::sun::star;
......
......@@ -32,6 +32,7 @@
#include <com/sun/star/embed/StorageFormats.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
......@@ -49,6 +50,7 @@
#include <comphelper/documentconstants.hxx>
#include <comphelper/propertyvalue.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/xmlsechelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
......
......@@ -22,6 +22,7 @@
#include <certificateviewer.hxx>
#include <biginteger.hxx>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <comphelper/sequence.hxx>
#include <comphelper/xmlsechelper.hxx>
......
......@@ -20,12 +20,13 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_BUFFERNODE_HXX
#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_BUFFERNODE_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
#include <vector>
namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
class ElementMark;
class ElementCollector;
......
......@@ -22,6 +22,7 @@
#include "elementcollector.hxx"
#include "buffernode.hxx"
#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
namespace cssu = com::sun::star::uno;
namespace cssxc = com::sun::star::xml::crypto;
......
......@@ -21,8 +21,10 @@
#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTCOLLECTOR_HXX
#include "elementmark.hxx"
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
#include <com/sun/star/uno/Reference.hxx>
namespace com::sun::star::xml::crypto::sax { class XReferenceResolvedListener; }
class ElementCollector : public ElementMark
/****** elementcollector.hxx/CLASS ElementCollector ***************************
......
......@@ -20,7 +20,6 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTMARK_HXX
#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ELEMENTMARK_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/crypto/sax/ElementMarkType.hpp>
class BufferNode;
......
......@@ -25,6 +25,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>
#include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
......
......@@ -19,11 +19,13 @@
#include <framework/signaturecreatorimpl.hxx>
#include <framework/xmlsignaturetemplateimpl.hxx>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
using namespace com::sun::star::uno;
namespace cssu = com::sun::star::uno;
......
......@@ -19,11 +19,13 @@
#include <framework/signatureverifierimpl.hxx>
#include <framework/xmlsignaturetemplateimpl.hxx>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
......
......@@ -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 ;
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>