summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-01-26 09:10:04 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-01-26 10:43:25 +0000
commita4af8986c94ff2d1bea0c21f798330efcc97b133 (patch)
treec1dc17a1474934c3393f57fd2a3e0446629e39ee
parentuse rtl::Reference in OImageControlModel (diff)
downloadcore-a4af8986c94ff2d1bea0c21f798330efcc97b133.tar.gz
core-a4af8986c94ff2d1bea0c21f798330efcc97b133.zip
[API CHANGE] offapi: remove unused xsec_fw UNO services
This is mostly just the offapi/ part, more C++ code can be removed in xmlsecurity/ after this. SignatureVerifier, SAXEventKeeper, SignatureCreator, XMLSignatureTemplate and XMLEncryptionTemplate was only used inside xmlsecurity, but they all are accessed directly already. Decryptor and Encryptor wasn't even used by internal code since they were added in commit 9f34fde7a8750b856570b5e855d2ecb226bf0c23 (libxmlsec, 2004-07-12). It seems to be unlikely that any of these non-published services were used by 3rd-party code, since they were specific to other xmlsecurity/ code, not generic functionality that could be useful in other contexts. Change-Id: I4bcfa88d11d2b92a440f6617193c6460125ce4fd Reviewed-on: https://gerrit.libreoffice.org/33569 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--offapi/UnoApi_offapi.mk9
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl36
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl36
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Decryptor.idl50
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Encryptor.idl52
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl48
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl54
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl52
-rw-r--r--postprocess/Rdb_services.mk1
-rw-r--r--sc/CppunitTest_sc_bugfix_test.mk1
-rw-r--r--sc/CppunitTest_sc_copypaste.mk1
-rw-r--r--sc/CppunitTest_sc_subsequent_export_test.mk1
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk1
-rw-r--r--sd/CppunitTest_sd_html_export_tests.mk1
-rw-r--r--sd/CppunitTest_sd_import_tests.mk1
-rw-r--r--sd/CppunitTest_sd_misc_tests.mk1
-rw-r--r--xmlsecurity/Library_xsec_fw.mk2
-rw-r--r--xmlsecurity/util/xsec_fw.component47
18 files changed, 0 insertions, 394 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c53b2d938392..a76f42aff91a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -461,9 +461,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/crypto,\
NSSInitializer \
SecurityEnvironment \
SEInitializer \
- XMLEncryptionTemplate \
XMLSecurityContext \
- XMLSignatureTemplate \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/dom,\
DocumentBuilder \
@@ -1595,13 +1593,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/crypto,\
XMLEncryption \
XMLSignature \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/crypto/sax,\
- Decryptor \
- Encryptor \
- SAXEventKeeper \
- SignatureCreator \
- SignatureVerifier \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml/input,\
SaxDocumentHandler \
))
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
deleted file mode 100644
index 347be1cce735..000000000000
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ /dev/null
@@ -1,36 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_xmlencryptiontemplate_idl_
-#define __com_sun_star_xml_crypto_xmlencryptiontemplate_idl_
-
-#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
-module com { module sun { module star { module xml { module crypto {
-
-/**
- * Service of XMLEncryptionTemplate
- */
-service XMLEncryptionTemplate : com::sun::star::xml::crypto::XXMLEncryptionTemplate;
-
-} ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
deleted file mode 100644
index f966baba0694..000000000000
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ /dev/null
@@ -1,36 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_xmlsignaturetemplate_idl_
-#define __com_sun_star_xml_crypto_xmlsignaturetemplate_idl_
-
-#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
-module com { module sun { module star { module xml { module crypto {
-
-/**
- * Service of XMLSignatureTemplate
- */
-service XMLSignatureTemplate : com::sun::star::xml::crypto::XXMLSignatureTemplate ;
-
-} ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
deleted file mode 100644
index 5b0dbe527e9b..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ /dev/null
@@ -1,50 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_decryptor_idl_
-#define __com_sun_star_xml_crypto_sax_decryptor_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
-#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
-#include <com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl>
-#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Service of Decryptor
- */
-service Decryptor {
- interface XReferenceResolvedListener ;
- interface XBlockerMonitor ;
- interface XDecryptionResultBroadcaster ;
- interface XKeyCollector ;
- interface XMissionTaker ;
- interface com::sun::star::lang::XInitialization ;
-};
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
deleted file mode 100644
index 40fcf5ffcf47..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ /dev/null
@@ -1,52 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_encryptor_idl_
-#define __com_sun_star_xml_crypto_sax_encryptor_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
-#include <com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl>
-#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Service of Encryptor
- */
-service Encryptor {
- interface XReferenceResolvedListener ;
- interface XReferenceCollector ;
- interface XBlockerMonitor ;
- interface XEncryptionResultBroadcaster ;
- interface XKeyCollector ;
- interface XMissionTaker ;
- interface com::sun::star::lang::XInitialization ;
-};
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
deleted file mode 100644
index cb0d96faf935..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ /dev/null
@@ -1,48 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_saxeventkeeper_idl_
-#define __com_sun_star_xml_crypto_sax_saxeventkeeper_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl>
-#include <com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl>
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Service of SAXEventKeeper
- */
-service SAXEventKeeper {
- interface XSecuritySAXEventKeeper ;
- interface XReferenceResolvedBroadcaster ;
- interface XSAXEventKeeperStatusChangeBroadcaster ;
- interface com::sun::star::xml::sax::XDocumentHandler ;
- interface com::sun::star::lang::XInitialization ;
-};
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
deleted file mode 100644
index cc2c6f2ee353..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ /dev/null
@@ -1,54 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_signaturecreator_idl_
-#define __com_sun_star_xml_crypto_sax_signaturecreator_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/xml/crypto/XUriBinding.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl>
-#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.idl>
-#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/*
- * * Service of SignatureCreator
- */
-
-service SignatureCreator
-{
- interface XReferenceResolvedListener ;
- interface XReferenceCollector ;
- interface XSignatureCreationResultBroadcaster ;
- interface XBlockerMonitor ;
- interface XKeyCollector ;
- interface XMissionTaker ;
- interface com::sun::star::xml::crypto::XUriBinding;
- interface com::sun::star::lang::XInitialization ;
-} ; } ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
deleted file mode 100644
index aff2a68c49c4..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ /dev/null
@@ -1,52 +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 .
- */
-
-#ifndef __com_sun_star_xml_crypto_sax_signatureverifier_idl_
-#define __com_sun_star_xml_crypto_sax_signatureverifier_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/xml/crypto/XUriBinding.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl>
-#include <com/sun/star/xml/crypto/sax/XReferenceCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl>
-#include <com/sun/star/xml/crypto/sax/XKeyCollector.idl>
-#include <com/sun/star/xml/crypto/sax/XMissionTaker.idl>
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Service of SignatureVerifier
- */
-service SignatureVerifier {
- interface XReferenceResolvedListener ;
- interface XReferenceCollector ;
- interface XSignatureVerifyResultBroadcaster ;
- interface XKeyCollector ;
- interface XMissionTaker ;
- interface com::sun::star::xml::crypto::XUriBinding;
- interface com::sun::star::lang::XInitialization ;
-};
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index e999d053bade..d77898e56d91 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -111,7 +111,6 @@ $(eval $(call gb_Rdb_add_components,services,\
xmlscript/util/xmlscript \
$(if $(ENABLE_NSS), \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
$(if $(ENABLE_COINMP), \
sccomp/source/solver/coinmpsolver \
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 2305b296f7b0..65896590edc8 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -106,7 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
uui/util/uui \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index e0e48e280131..4920c80ae77d 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
uui/util/uui \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 668bdd2ca391..453314cb04bc 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
uui/util/uui \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index b2e10fd9f439..b1537df1d0e5 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -106,7 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
uui/util/uui \
xmloff/util/xo \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
))
ifeq ($(OS),WNT)
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 5d60aa002f25..ea21eb6d733a 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -103,7 +103,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\
unoxml/source/service/unoxml \
uui/util/uui \
xmloff/util/xo \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index adebcf0b00d2..ea175d02102d 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
unoxml/source/service/unoxml \
uui/util/uui \
xmloff/util/xo \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
))
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index f432f3aed4f2..e576285a00d5 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -115,7 +115,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\
unoxml/source/service/unoxml \
uui/util/uui \
xmloff/util/xo \
- xmlsecurity/util/xsec_fw \
xmlsecurity/util/xmlsecurity \
))
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index 8d75537f414a..8b83c7033724 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Library_Library,xsec_fw))
-$(eval $(call gb_Library_set_componentfile,xsec_fw,xmlsecurity/util/xsec_fw))
-
$(eval $(call gb_Library_set_include,xsec_fw,\
$$(INCLUDE) \
-I$(SRCDIR)/xmlsecurity/inc \
diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component
deleted file mode 100644
index 632a3acd3c34..000000000000
--- a/xmlsecurity/util/xsec_fw.component
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="xsec_fw" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.xml.security.framework.DecryptorImpl">
- <service name="com.sun.star.xml.crypto.sax.Decryptor"/>
- </implementation>
- <implementation name="com.sun.star.xml.security.framework.EncryptorImpl">
- <service name="com.sun.star.xml.crypto.sax.Encryptor"/>
- </implementation>
- <implementation name="com.sun.star.xml.security.framework.SAXEventKeeperImpl">
- <service name="com.sun.star.xml.crypto.sax.SAXEventKeeper"/>
- </implementation>
- <implementation
- name="com.sun.star.xml.security.framework.SignatureCreatorImpl">
- <service name="com.sun.star.xml.crypto.sax.SignatureCreator"/>
- </implementation>
- <implementation
- name="com.sun.star.xml.security.framework.SignatureVerifierImpl">
- <service name="com.sun.star.xml.crypto.sax.SignatureVerifier"/>
- </implementation>
- <implementation
- name="com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl">
- <service name="com.sun.star.xml.crypto.XMLEncryptionTemplate"/>
- </implementation>
- <implementation
- name="com.sun.star.xml.security.framework.XMLSignatureTemplateImpl">
- <service name="com.sun.star.xml.crypto.XMLSignatureTemplate"/>
- </implementation>
-</component>