[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk xmlsecurity/source xmlsecurity/util
Miklos Vajna
vmiklos at collabora.co.uk
Thu Dec 14 13:26:27 UTC 2017
offapi/UnoApi_offapi.mk | 2
offapi/com/sun/star/security/SerialNumberAdapter.idl | 47 ----------------
offapi/com/sun/star/security/XSerialNumberAdapter.idl | 50 ------------------
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 12 ----
xmlsecurity/util/xsec_xmlsec.component | 3 -
xmlsecurity/util/xsec_xmlsec.windows.component | 3 -
6 files changed, 1 insertion(+), 116 deletions(-)
New commits:
commit 1390c91c7584a89298906849cdabae131f8a6191
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Dec 14 10:13:29 2017 +0100
[API CHANGE] offapi: remove unused css.security.SerialNumberAdapter
This is mostly just the offapi/ part, more C++ code can be removed in
xmlsecurity/ after this.
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: I0d798577a42445e65a4c5178fcb4464ea03bc56e
Reviewed-on: https://gerrit.libreoffice.org/46442
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 472771a5c15d..fd05331584e3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -359,7 +359,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/sdbc,\
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/security,\
CertificateContainer \
DocumentDigitalSignatures \
- SerialNumberAdapter \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/setup,\
UpdateCheck \
@@ -3336,7 +3335,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/security,\
XCertificateExtension \
XDocumentDigitalSignatures \
XSanExtension \
- XSerialNumberAdapter \
))
$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet/opencl,\
diff --git a/offapi/com/sun/star/security/SerialNumberAdapter.idl b/offapi/com/sun/star/security/SerialNumberAdapter.idl
deleted file mode 100644
index 6473c6c4ee42..000000000000
--- a/offapi/com/sun/star/security/SerialNumberAdapter.idl
+++ /dev/null
@@ -1,47 +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_security_SerialNumberAdapter_idl_
-#define __com_sun_star_security_SerialNumberAdapter_idl_
-
-
-module com { module sun { module star { module security {
- interface XSerialNumberAdapter; };
-}; }; };
-
-
-module com { module sun { module star { module security {
-
-
-/** provides conversion services for Serial Numbers.
-
- <p>An implementation of this service enables the conversion of certificate
- serial number to and from a string</p>
-
- @since OOo 3.1
- */
-
-service SerialNumberAdapter : XSerialNumberAdapter;
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/security/XSerialNumberAdapter.idl b/offapi/com/sun/star/security/XSerialNumberAdapter.idl
deleted file mode 100644
index 07356bcbe126..000000000000
--- a/offapi/com/sun/star/security/XSerialNumberAdapter.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_security_XSerialNumberAdapter_idl_
-#define __com_sun_star_security_XSerialNumberAdapter_idl_
-
-#include <com/sun/star/uno/XInterface.idl>
-
-module com { module sun { module star { module security {
-
-/**
- * Interface of Certificate Serial Number Converter
- *
- * <p>This interface converts a certificate serial number to and from a string</p>
- */
-interface XSerialNumberAdapter : com::sun::star::uno::XInterface
-{
- /**
- * Convert the SerialNumber to a string
- */
- string toString( [in]sequence< byte > SerialNumber );
-
- /**
- * Convert the SerialNumber to a sequence
- */
- sequence< byte > toSequence( [in]string SerialNumber );
-
-} ;
-
-} ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index ea1c2d6f263d..c00803deb16c 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/security/XSerialNumberAdapter.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -38,8 +37,7 @@
namespace {
class Service:
- public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::security::XSerialNumberAdapter >
+ public cppu::WeakImplHelper<css::lang::XServiceInfo>
{
public:
Service() {}
@@ -57,14 +55,6 @@ private:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
{ return xml_security::serial_number_adapter::serviceNames(); }
-
- virtual OUString SAL_CALL toString(
- css::uno::Sequence< sal_Int8 > const & SerialNumber) override
- { return xmlsecurity::bigIntegerToNumericString(SerialNumber); }
-
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence(
- OUString const & SerialNumber) override
- { return xmlsecurity::numericStringToBigInteger(SerialNumber); }
};
}
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
index d47ceef0b8d5..3b6df511fed5 100644
--- a/xmlsecurity/util/xsec_xmlsec.component
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -19,9 +19,6 @@
<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.comp.security.SerialNumberAdapter">
- <service name="com.sun.star.security.SerialNumberAdapter"/>
- </implementation>
<implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl">
<service name="com.sun.star.xml.crypto.NSSInitializer"/>
<service name="com.sun.star.xml.crypto.SEInitializer"/>
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
index 1e8aa5fbd3c1..fc7df19b1b9e 100644
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -19,9 +19,6 @@
<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.comp.security.SerialNumberAdapter">
- <service name="com.sun.star.security.SerialNumberAdapter"/>
- </implementation>
<implementation name="com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl">
<service name="com.sun.star.xml.crypto.NSSInitializer"/>
</implementation>
More information about the Libreoffice-commits
mailing list