xmlsecurity/inc/certificatechooser.hxx | 1 xmlsecurity/inc/digitalsignaturesdialog.hxx | 4 -- xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 1 xmlsecurity/inc/framework/securityengine.hxx | 2 - xmlsecurity/inc/framework/signatureengine.hxx | 4 -- xmlsecurity/inc/framework/signatureverifierimpl.hxx | 1 xmlsecurity/inc/xmlsec/errorcallback.hxx | 2 - xmlsecurity/inc/xmlsec/saxhelper.hxx | 4 -- xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 2 - xmlsecurity/inc/xmlsec/xmlstreamio.hxx | 2 - xmlsecurity/qa/unit/signing/signing2.cxx | 7 ---- xmlsecurity/source/component/documentdigitalsignatures.cxx | 8 ----- xmlsecurity/source/dialogs/certificatechooser.cxx | 3 - xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 16 ---------- xmlsecurity/source/dialogs/macrosecurity.cxx | 3 - xmlsecurity/source/gpg/CertificateImpl.cxx | 3 - xmlsecurity/source/gpg/SecurityEnvironment.cxx | 4 +- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 6 ++- xmlsecurity/source/helper/UriBindingHelper.cxx | 1 xmlsecurity/source/helper/ooxmlsecparser.cxx | 2 - xmlsecurity/source/helper/xmlsignaturehelper.cxx | 1 xmlsecurity/source/helper/xsecparser.cxx | 2 - xmlsecurity/source/xmlsec/biginteger.cxx | 2 + xmlsecurity/source/xmlsec/errorcallback.cxx | 2 + xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 5 +-- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 8 +++-- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 1 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 1 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 2 - xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 2 - xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 3 - xmlsecurity/source/xmlsec/xmlstreamio.cxx | 1 32 files changed, 29 insertions(+), 77 deletions(-)
New commits: commit 03b00e03c2cecdc6358e663be7b564c4ccec76f9 Author: Rafał Dobrakowski <[email protected]> AuthorDate: Mon Mar 11 00:48:26 2024 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Thu Mar 28 12:50:41 2024 +0100 tdf#146619 Remove unused #includes from C/C++ files 'xmlsecurity' module was cleaned. Add some headers from xmlsec-wrapper.h in preparation for its removal Change-Id: Id66e6d40d4d5d980626832c0e2f6255fc31b4bcf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164639 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index ef81678ffcc0..494ea40de1e4 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/weld.hxx> #include <unotools/resmgr.hxx> -#include <unotools/useroptions.hxx> #include <unordered_map> namespace com::sun::star { diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 08db226fb8a8..3f515a36706d 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -20,14 +20,10 @@ #pragma once #include <vcl/weld.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include "documentsignaturehelper.hxx" -#include "xmlsignaturehelper.hxx" #include "documentsignaturemanager.hxx" -#include <vector> - namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace io { class XStream; } diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 161b9a93619e..a0428174fc7f 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <xmlsecuritydllapi.h> #include <cppuhelper/implbase.hxx> #include <vector> #include <memory> diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index bebf07306b63..17a3b5294094 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -28,8 +28,6 @@ #include <cppuhelper/implbase.hxx> -#include <xmlsecuritydllapi.h> - class SAL_DLLPUBLIC_RTTI SecurityEngine : public cppu::WeakImplHelper < css::xml::crypto::sax::XReferenceResolvedListener, diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 6446c2f36729..3a41943e2839 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -19,15 +19,11 @@ #pragma once -#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.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/XUriBinding.hpp> #include <cppuhelper/implbase.hxx> -#include <xmlsecuritydllapi.h> #include <framework/securityengine.hxx> #include <vector> diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 15c79643e0aa..92a7269a0734 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <xmlsecuritydllapi.h> #include <framework/signatureengine.hxx> namespace com::sun::star::xml::crypto::sax { class XSignatureVerifyResultListener; } diff --git a/xmlsecurity/inc/xmlsec/errorcallback.hxx b/xmlsecurity/inc/xmlsec/errorcallback.hxx index 80ba564e9b2a..5ddd341d4a22 100644 --- a/xmlsecurity/inc/xmlsec/errorcallback.hxx +++ b/xmlsecurity/inc/xmlsec/errorcallback.hxx @@ -19,8 +19,6 @@ #pragma once -#include <xsecxmlsecdllapi.h> - // Only used for logging void setErrorRecorder(); //ToDo diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx index a5863ffd0e2a..e871acc4b90e 100644 --- a/xmlsecurity/inc/xmlsec/saxhelper.hxx +++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx @@ -22,11 +22,9 @@ #include <sal/config.h> #include <string_view> +#include <com/sun/star/xml/csax/XMLAttribute.hpp> #include <libxml/parser.h> -#include <libxml/tree.h> - -#include <rtl/ustring.hxx> namespace com::sun::star::xml::csax { struct XMLAttribute; } namespace com::sun::star::uno { template <typename > class Sequence; } diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 527564fd30c9..787826951e57 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -31,8 +31,6 @@ #define NODEPOSITION_STARTELEMENT 2 #define NODEPOSITION_ENDELEMENT 3 -#include <libxml/tree.h> - class XMLDocumentWrapper_XmlSecImpl final : public cppu::WeakImplHelper < css::xml::wrapper::XXMLDocumentWrapper, diff --git a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx index 6e3d506a4d00..93cfa6d59ae0 100644 --- a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx @@ -19,7 +19,7 @@ #pragma once -#include <xsecxmlsecdllapi.h> +#include <sal/types.h> namespace com::sun::star::xml::crypto { diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx b/xmlsecurity/qa/unit/signing/signing2.cxx index cb7922d19918..46bdc303d0ee 100644 --- a/xmlsecurity/qa/unit/signing/signing2.cxx +++ b/xmlsecurity/qa/unit/signing/signing2.cxx @@ -19,10 +19,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/xml/crypto/SEInitializer.hpp> #include <officecfg/Office/Common.hxx> @@ -30,13 +27,9 @@ #include <sfx2/sfxbasemodel.hxx> #include <sfx2/objsh.hxx> #include <comphelper/documentconstants.hxx> -#include <comphelper/propertysequence.hxx> #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/storagehelper.hxx> -#include <osl/file.hxx> -#include <osl/process.h> -#include <osl/thread.hxx> using namespace css; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index f6ffd9a7566f..c0f9a58b14f7 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -27,7 +27,6 @@ #include <biginteger.hxx> #include <strings.hrc> #include <pdfsignaturehelper.hxx> -#include <sax/tools/converter.hxx> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/StorageFormats.hpp> @@ -35,15 +34,8 @@ #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> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/ucb/XCommandProcessor.hpp> -#include <com/sun/star/ucb/Command.hpp> #include <com/sun/star/uno/SecurityException.hpp> -#include <vcl/weld.hxx> #include <vcl/svapp.hxx> -#include <tools/date.hxx> #include <tools/time.hxx> #include <unotools/securityoptions.hxx> #include <com/sun/star/security/CertificateValidity.hpp> diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index e381b38f2933..32e75f91f211 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -28,10 +28,9 @@ #include <com/sun/star/security/NoPasswordException.hpp> #include <com/sun/star/security/CertificateCharacters.hpp> -#include <o3tl/safeint.hxx> #include <unotools/datetime.hxx> #include <unotools/charclass.hxx> - +#include <unotools/useroptions.hxx> #include <resourcemanager.hxx> #include <strings.hrc> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 8064a8266988..50621fa77797 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -26,34 +26,20 @@ #include <certificatechooser.hxx> #include <certificateviewer.hxx> #include <biginteger.hxx> -#include <sax/tools/converter.hxx> #include <comphelper/diagnose_ex.hxx> #include <comphelper/configuration.hxx> #include <officecfg/Office/Common.hxx> +#include <com/sun/star/uno/SecurityException.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/security/NoPasswordException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/security/CertificateValidity.hpp> -#include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/security/CertificateKind.hpp> -#include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> -#include <com/sun/star/system/SystemShellExecuteException.hpp> #include <osl/file.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/uri.hxx> #include <sal/log.hxx> - -#include <tools/date.hxx> -#include <tools/time.hxx> #include <unotools/datetime.hxx> #include <bitmaps.hlst> diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 9432220ae5ae..9ff7b4088bd7 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -28,12 +28,11 @@ #include <osl/file.hxx> #include <sal/log.hxx> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/xmlsechelper.hxx> #include <com/sun/star/uno/Exception.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <sfx2/filedlghelper.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx index b771c1282fa0..697b2d67c6f8 100644 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx @@ -7,11 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <config_gpgme.h> - #include "CertificateImpl.hxx" -#include <comphelper/servicehelper.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx index e6813228a457..b4ac90960437 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx @@ -13,7 +13,6 @@ #include <com/sun/star/security/CertificateCharacters.hpp> #include <com/sun/star/security/CertificateValidity.hpp> -#include <comphelper/servicehelper.hxx> #include <vector> #include <rtl/ref.hxx> @@ -28,6 +27,9 @@ #include <key.h> #include <keylistresult.h> #include <xmlsec-wrapper.h> +#include <libxml/xmlstring.h> +#include <xmlsec/base64.h> +#include <xmlsec/xmlsec.h> #if defined _MSC_VER && defined __clang__ #pragma clang diagnostic push diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 22488144f7c7..2b3777d3171b 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <sal/log.hxx> #include <xmlsec-wrapper.h> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <gpg/xmlsignature_gpgimpl.hxx> @@ -33,7 +32,6 @@ #pragma clang diagnostic pop #endif #include <context.h> -#include <key.h> #include <data.h> #include <signingresult.h> #include <importresult.h> @@ -41,6 +39,10 @@ #include <xmlelementwrapper_xmlsecimpl.hxx> #include <xmlsec/xmlstreamio.hxx> #include <xmlsec/errorcallback.hxx> +#include <xmlsec/xmltree.h> +#include <xmlsec/base64.h> +#include <xmlsec/xmldsig.h> +#include <xmlsec/xmlsec.h> #include "SecurityEnvironment.hxx" diff --git a/xmlsecurity/source/helper/UriBindingHelper.cxx b/xmlsecurity/source/helper/UriBindingHelper.cxx index d3f8419de581..9bd101934e47 100644 --- a/xmlsecurity/source/helper/UriBindingHelper.cxx +++ b/xmlsecurity/source/helper/UriBindingHelper.cxx @@ -19,7 +19,6 @@ #include <UriBindingHelper.hxx> -#include <tools/solar.h> #include <tools/stream.hxx> #include <unotools/streamwrap.hxx> diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index 2692190ccb89..c75a8c6f4aa6 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -13,7 +13,7 @@ #include <xsecctl.hxx> #include <xmloff/xmlnamespace.hxx> -#include <xmloff/xmltkmap.hxx> +#include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <com/sun/star/xml/sax/SAXException.hpp> diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 3b13f79f33f1..3bb0b04c4ea1 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -44,7 +44,6 @@ #include <comphelper/ofopxmlhelper.hxx> #include <comphelper/sequence.hxx> #include <comphelper/diagnose_ex.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <optional> diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index af3562f46c40..cf4f0bbe09fe 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -23,7 +23,7 @@ #include <xmlsignaturehelper.hxx> #include <xmloff/xmlnamespace.hxx> -#include <xmloff/xmltkmap.hxx> +#include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <com/sun/star/xml/sax/SAXException.hpp> diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 1a4ab6fd9d13..c767d8774afd 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -22,6 +22,8 @@ #include <xmlsec-wrapper.h> #include <com/sun/star/uno/Sequence.hxx> +#include <xmlsec/xmlsec.h> +#include <xmlsec/bn.h> #include <comphelper/sequence.hxx> diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index a535ffa770d3..4e69a6310550 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -24,6 +24,8 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <xmlsec/xmlsec.h> +#include <xmlsec/errors.h> #ifdef _WIN32 #include <prewin.h> diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 823368efc3c8..df0414c83df7 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -21,8 +21,9 @@ #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> -#include <com/sun/star/xml/crypto/NSSInitializer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> + #include <cppuhelper/supportsservice.hxx> #include <officecfg/Office/Common.hxx> #include <sal/types.h> @@ -40,8 +41,6 @@ #include "digestcontext.hxx" #include "ciphercontext.hxx" - -#include <cstddef> #include <memory> #include <utility> #include <vector> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index d75d55f50475..fe150e7a0565 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -18,16 +18,16 @@ */ #include "nssrenam.h" +#include <nss.h> #include <cert.h> +#include <pk11pub.h> #include <secerr.h> #include <ocsp.h> #include <sal/config.h> -#include <sal/macros.h> #include <osl/diagnose.h> #include "securityenvironment_nssimpl.hxx" #include <cppuhelper/supportsservice.hxx> -#include <comphelper/servicehelper.hxx> #include <xmlsec-wrapper.h> @@ -45,6 +45,10 @@ #include "secerror.hxx" #include <prerror.h> #include <keyhi.h> +#include <xmlsec/base64.h> +#include <xmlsec/keysmngr.h> +#include <xmlsec/nss/app.h> +#include <xmlsec/nss/pkikeys.h> // added for password exception #include <com/sun/star/security/NoPasswordException.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index c0e469899852..544f48d8fb7b 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -39,6 +39,7 @@ #include <vector> #include <xmlsec-wrapper.h> +#include <xmlsec/xmlsec.h> namespace com::sun::star::security { class XCertificate; } class X509Certificate_NssImpl; diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 6b5c3d6c5bc6..d8b0b0e6e16a 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -20,7 +20,6 @@ #include <sal/types.h> #include <com/sun/star/xml/crypto/SecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XMLSecurityContext.hpp> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include "seinitializer_nssimpl.hxx" diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index e1526ea90d54..b8bfa1311dc6 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -25,7 +25,6 @@ #include <hasht.h> #include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> @@ -36,7 +35,6 @@ #include <certificateextension_xmlsecimpl.hxx> #include "sanextension_nssimpl.hxx" -#include <o3tl/string_view.hxx> #include <tools/time.hxx> #include <svl/sigstruct.hxx> diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 4c5cc4b418d8..a5083f37736f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -28,7 +28,7 @@ #include "securityenvironment_nssimpl.hxx" -#include <comphelper/servicehelper.hxx> +#include <xmlsec/xmldsig.h> #include <sal/log.hxx> #include <com/sun/star/xml/crypto/XXMLSignature.hpp> diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index ccc4f03dd964..295dcab98083 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include "xmlelementwrapper_xmlsecimpl.hxx" -#include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> namespace com::sun::star::uno { class XComponentContext; } diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index b3ee76712042..1d58583affd9 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> #include <xmlsec-wrapper.h> +#include <xmlsec/io.h> /* * Implementation of the I/O interfaces based on stream and URI binding
