[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/util

[Miklos Vajna]

 xmlsecurity/Library_xsec_xmlsec.mk             |    4 -
 xmlsecurity/util/xsec_xmlsec.windows.component |   53 -------------------------
 2 files changed, 57 deletions(-)

New commits:
commit aaee9c324617b8f56280a23937a2fed6888b0de6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 26 22:44:41 2018 +0200

    xmlsecurity: remove duplicated Windows-specific component file
    
    Change-Id: Iefc96ded8e53004a22041ee4299200a3d02a7eb5
    Reviewed-on: https://gerrit.libreoffice.org/53545
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 846b89800a5a..ced31bc9c668 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -9,11 +9,7 @@
 
 $(eval $(call gb_Library_Library,xsec_xmlsec))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec.windows))
-else
 $(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec))
-endif
 
 $(eval $(call gb_Library_set_include,xsec_xmlsec,\
 	$$(INCLUDE) \
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
deleted file mode 100644
index 6ea539f9ee0f..000000000000
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ /dev/null
@@ -1,53 +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_xmlsec" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.xml.crypto.NSSInitializer"
-    constructor="com_sun_star_xml_crypto_NSSInitializer_get_implementation">
-    <service name="com.sun.star.xml.crypto.NSSInitializer"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.crypto.SEInitializer"
-    constructor="com_sun_star_xml_crypto_SEInitializer_get_implementation">
-    <service name="com.sun.star.xml.crypto.SEInitializer"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.security.SEInitializer_Gpg">
-    <service name="com.sun.star.xml.crypto.GPGSEInitializer"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.crypto.SecurityEnvironment"
-    constructor="com_sun_star_xml_crypto_SecurityEnvironment_get_implementation">
-    <service name="com.sun.star.xml.crypto.SecurityEnvironment"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.wrapper.XMLDocumentWrapper"
-    constructor="com_sun_star_xml_wrapper_XMLDocumentWrapper_get_implementation">
-    <service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.wrapper.XMLElementWrapper"
-    constructor="com_sun_star_xml_wrapper_XMLElementWrapper_get_implementation">
-    <service name="com.sun.star.xml.wrapper.XMLElementWrapper"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.crypto.XMLSecurityContext"
-    constructor="com_sun_star_xml_crypto_XMLSecurityContext_get_implementation">
-    <service name="com.sun.star.xml.crypto.XMLSecurityContext"/>
-  </implementation>
-  <implementation name="com.sun.star.xml.crypto.XMLSignature"
-    constructor="com_sun_star_xml_crypto_XMLSignature_get_implementation">
-    <service name="com.sun.star.xml.crypto.XMLSignature"/>
-  </implementation>
-</component>