[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk xmlsecurity/util

[Miklos Vajna]

 offapi/UnoApi_offapi.mk                          |    1 
 offapi/com/sun/star/xml/crypto/XMLEncryption.idl |   42 -----------------------
 xmlsecurity/util/xsec_xmlsec.component           |    3 -
 xmlsecurity/util/xsec_xmlsec.windows.component   |    3 -
 4 files changed, 49 deletions(-)

New commits:
commit 2303d4f1a2b7e25fe864323adeec398057cebe72
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jul 18 22:46:01 2017 +0200

    [API CHANGE] offapi: remove unused css.xml.crypto.XMLEncryption
    
    This is mostly just the offapi/ part, more C++ code can be removed in
    xmlsecurity/ after this. XMLEncryption wasn't used by internal code
    since it was added in commit 9f34fde7a8750b856570b5e855d2ecb226bf0c23
    (libxmlsec, 2004-07-12).
    
    It seems to be unlikely that this non-published service was used by
    3rd-party code, since it was specific to other xmlsecurity/ code, not
    generic functionality that could be useful in other contexts.
    
    Change-Id: Ia0168f67d1c8ff7a019760ac436511f219eee94e
    Reviewed-on: https://gerrit.libreoffice.org/40162
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 14a80f5e7bd8..ac292df2578e 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1590,7 +1590,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/xml,\
 	XMLImportFilter \
 ))
 $(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/input,\
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
deleted file mode 100644
index 485d27f493e4..000000000000
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ /dev/null
@@ -1,42 +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_xmlencryption_idl_
-#define __com_sun_star_xml_crypto_xmlencryption_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-#include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-#include <com/sun/star/lang/XInitialization.idl>
-
-module com { module sun { module star { module xml { module crypto {
-
-/**
- * Service of XMLEncryption
- */
-service XMLEncryption {
-    interface com::sun::star::xml::crypto::XXMLEncryption ;
-    interface com::sun::star::lang::XInitialization ;
-} ;
-
-} ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
index cf0bc54dc4e2..ff0e09b82f92 100644
--- a/xmlsecurity/util/xsec_xmlsec.component
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -35,9 +35,6 @@
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl">
     <service name="com.sun.star.xml.wrapper.XMLElementWrapper"/>
   </implementation>
-  <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl">
-    <service name="com.sun.star.xml.crypto.XMLEncryption"/>
-  </implementation>
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl">
     <service name="com.sun.star.xml.crypto.XMLSecurityContext"/>
   </implementation>
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
index 36e310f8d223..1e8aa5fbd3c1 100644
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -37,9 +37,6 @@
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl">
     <service name="com.sun.star.xml.wrapper.XMLElementWrapper"/>
   </implementation>
-  <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl">
-    <service name="com.sun.star.xml.crypto.XMLEncryption"/>
-  </implementation>
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl">
     <service name="com.sun.star.xml.crypto.XMLSecurityContext"/>
   </implementation>