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. - -

An implementation of this service enables the conversion of certificate - serial number to and from a string

- - @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 - -module com { module sun { module star { module security { - -/** - * Interface of Certificate Serial Number Converter - * - *

This interface converts a certificate serial number to and from a string

- */ -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 #include -#include #include #include #include @@ -38,8 +37,7 @@ namespace { class Service: - public cppu::WeakImplHelper< - css::lang::XServiceInfo, css::security::XSerialNumberAdapter > + public cppu::WeakImplHelper { 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 @@ - - - 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 @@ - - -