[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk postprocess/Rdb_services.mk sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sd/CppunitTest_sd_html_export_tests.mk sd/CppunitTest_sd_import_tests.mk sd/CppunitTest_sd_misc_tests.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/util
Miklos Vajna
vmiklos at collabora.co.uk
Thu Jan 26 10:44:06 UTC 2017
offapi/UnoApi_offapi.mk | 9 --
offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl | 36 ----------
offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl | 36 ----------
offapi/com/sun/star/xml/crypto/sax/Decryptor.idl | 50 -------------
offapi/com/sun/star/xml/crypto/sax/Encryptor.idl | 52 --------------
offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl | 48 -------------
offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl | 54 ---------------
offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl | 52 --------------
postprocess/Rdb_services.mk | 1
sc/CppunitTest_sc_bugfix_test.mk | 1
sc/CppunitTest_sc_copypaste.mk | 1
sc/CppunitTest_sc_subsequent_export_test.mk | 1
sc/CppunitTest_sc_subsequent_filters_test.mk | 1
sd/CppunitTest_sd_html_export_tests.mk | 1
sd/CppunitTest_sd_import_tests.mk | 1
sd/CppunitTest_sd_misc_tests.mk | 1
xmlsecurity/Library_xsec_fw.mk | 2
xmlsecurity/util/xsec_fw.component | 47 -------------
18 files changed, 394 deletions(-)
New commits:
commit a4af8986c94ff2d1bea0c21f798330efcc97b133
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jan 26 09:10:04 2017 +0100
[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 at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c53b2d9..a76f42a 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 347be1c..0000000
--- 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 f966bab..0000000
--- 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 5b0dbe5..0000000
--- 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 40fcf5f..0000000
--- 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 cb0d96f..0000000
--- 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 cc2c6f2..0000000
--- 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 aff2a68..0000000
--- 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 e999d05..d77898e 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 2305b29..6589659 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 e0e48e2..4920c80 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 668bdd2..453314c 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 b2e10fd..b1537df 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 5d60aa0..ea21eb6 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 adebcf0..ea175d0 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 f432f3a..e576285 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 8d75537..8b83c70 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 632a3ac..0000000
--- 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>
More information about the Libreoffice-commits
mailing list