bin/update_pch | 1
xmlsecurity/IwyuFilter_xmlsecurity.yaml | 3
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 1
xmlsecurity/inc/xmlsec-wrapper.h | 43
----------
xmlsecurity/source/gpg/SecurityEnvironment.cxx | 1
xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 2
xmlsecurity/source/xmlsec/biginteger.cxx | 1
xmlsecurity/source/xmlsec/errorcallback.cxx | 1
xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx | 1
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 3
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 4
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 1
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 3
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 1
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 1
xmlsecurity/source/xmlsec/xmlsec_init.cxx | 1
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2
19 files changed, 10 insertions(+), 64 deletions(-)
New commits:
commit 50897e3fe001aeae5a6091ede155088461c798f3
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Thu Mar 28 01:54:23 2024 +0100
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Thu Mar 28 12:51:00 2024 +0100
Drop transitional header xmlsecurity/xmlsec-wrapper.h
It was introduced with
commit ec52e5e5a204862905b555cdc1f7393aede1f7d8
and the reason of that was the XMLSEC_NO_SIZE_T behavior consolidation.
But this was removed later with
commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b
Change-Id: Ib5350d9ab5554d1412821b762cd3ee7906b65b64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165440
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/bin/update_pch b/bin/update_pch
index 4719e5f9269f..73be15f0bf97 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -438,7 +438,6 @@ def filter_ignore(line, module):
if module == 'xmlsecurity':
ignore_list += [
'xmlsec/*',
- 'xmlsecurity/xmlsec-wrapper.h',
]
if module == 'external/pdfium':
ignore_list += [
diff --git a/xmlsecurity/IwyuFilter_xmlsecurity.yaml
b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
index b27a552751a6..76c774e71e7b 100644
--- a/xmlsecurity/IwyuFilter_xmlsecurity.yaml
+++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
@@ -95,9 +95,6 @@ excludelist:
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/xml/wrapper/XXMLElementWrapper.hpp
- xmlsecurity/source/xmlsec/errorcallback.cxx:
- # Needed for xmlsec/errors.h
- - xmlsec-wrapper.h
xmlsecurity/source/xmlsec/xmlstreamio.cxx:
# comphelper::ScopeGuard is in use but not noticed by IWYU
- comphelper/scopeguard.hxx
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index d69f3120e0ca..5e3d1f0b40be 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -136,7 +136,6 @@
#include <xmloff/dllapi.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
-#include <xmlsec-wrapper.h>
#include <xsecxmlsecdllapi.h>
#endif // PCH_LEVEL >= 4
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
deleted file mode 100644
index 3ad705400c52..000000000000
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#include <libxml/parser.h>
-#include <xmlsec/base64.h>
-#include <xmlsec/bn.h>
-#include <xmlsec/errors.h>
-#include <xmlsec/io.h>
-#include <xmlsec/keysmngr.h>
-#include <xmlsec/strings.h>
-#include <xmlsec/xmldsig.h>
-#include <xmlsec/xmlenc.h>
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/xmltree.h>
-#ifdef XMLSEC_CRYPTO_NSS
-#include <xmlsec/nss/app.h>
-#include <xmlsec/nss/crypto.h>
-#include <xmlsec/nss/pkikeys.h>
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index b4ac90960437..fb105ef5449f 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -26,7 +26,6 @@
#include <key.h>
#include <keylistresult.h>
-#include <xmlsec-wrapper.h>
#include <libxml/xmlstring.h>
#include <xmlsec/base64.h>
#include <xmlsec/xmlsec.h>
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 2b3777d3171b..04b4bec56ec3 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <xmlsec-wrapper.h>
+
#include <cppuhelper/supportsservice.hxx>
#include <gpg/xmlsignature_gpgimpl.hxx>
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx
b/xmlsecurity/source/xmlsec/biginteger.cxx
index c767d8774afd..489b0ed5cf83 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -20,7 +20,6 @@
#include <biginteger.hxx>
-#include <xmlsec-wrapper.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <xmlsec/xmlsec.h>
#include <xmlsec/bn.h>
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx
b/xmlsecurity/source/xmlsec/errorcallback.cxx
index 4e69a6310550..a2c429462e81 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include <xmlsec/errorcallback.hxx>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index ec3cecd4a751..2859c10e20d4 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include "akmngr.hxx"
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index cd3d40eb144e..3c3cf3254969 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -22,6 +22,8 @@
#include <cstddef>
#include <string.h>
+#include <xmlsec/base64.h>
+
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
@@ -36,7 +38,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
-#include <xmlsec-wrapper.h>
#include "akmngr.hxx"
#include <biginteger.hxx>
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 5867b2b46281..d2675d9b1125 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -25,6 +25,9 @@
#include <windows.h>
#include <wincrypt.h>
#include <sal/config.h>
+
+#include <xmlsec/keysmngr.h>
+
#include <rtl/ustring.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/factory.hxx>
@@ -41,7 +44,6 @@
#include <com/sun/star/security/CertificateValidity.hpp>
#include <vector>
-#include <xmlsec-wrapper.h>
#include <sal/types.h>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 99381e5e25fd..f88f4f903cd8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include "seinitializer_mscryptimpl.hxx"
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index f024a39b4791..f1f329de9258 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -18,12 +18,12 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include "securityenvironment_mscryptimpl.hxx"
#include <xmlsec/xmlstreamio.hxx>
+
#include "akmngr.hxx"
#include <cppuhelper/supportsservice.hxx>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 2a3709938a59..a3f72ba6ee1b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -20,8 +20,9 @@
#include <sal/config.h>
#include <sal/log.hxx>
#include <rtl/uuid.h>
-#include <xmlsec-wrapper.h>
+#include <xmlsec/xmldsig.h>
+#include <xmlsec/xmltree.h> // this MUST precde the mscng/x509.h for some
reason
#include <xmlsec/mscng/x509.h>
#include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index fe150e7a0565..e35fe7ca0c78 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -29,8 +29,6 @@
#include "securityenvironment_nssimpl.hxx"
#include <cppuhelper/supportsservice.hxx>
-#include <xmlsec-wrapper.h>
-
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/docpasswordrequest.hxx>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 544f48d8fb7b..b45a17397dbc 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -38,7 +38,6 @@
#include <string_view>
#include <vector>
-#include <xmlsec-wrapper.h>
#include <xmlsec/xmlsec.h>
namespace com::sun::star::security { class XCertificate; }
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index a5083f37736f..23b6ddac84c2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include <xmlsec/nss/x509.h>
diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx
b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
index be5c8bf559d1..472ece4c1180 100644
--- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx
+++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx
@@ -8,7 +8,6 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
#include <xmlsec/xmlsec_init.hxx>
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 1d58583affd9..2fa32955d6a8 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -18,7 +18,7 @@
*/
#include <sal/config.h>
-#include <xmlsec-wrapper.h>
+
#include <xmlsec/io.h>
/*
