[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Jan 5 08:04:15 UTC 2018
xmlsecurity/Library_xsec_xmlsec.mk | 1
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 81 ----------------------
xmlsecurity/source/xmlsec/serialnumberadapter.hxx | 49 -------------
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 8 --
4 files changed, 139 deletions(-)
New commits:
commit 9e27e5a73625d56615ab406c3ad3114431b3e507
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jan 4 15:52:21 2018 +0100
xmlsecurity: remove unused xml_security::serial_number_adapter
Change-Id: I09bc10a021fb5319cc256542206d94bc00646304
Reviewed-on: https://gerrit.libreoffice.org/47402
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 1ef27dbc6602..e312834ed4e8 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/certificateextension_certextn \
xmlsecurity/source/xmlsec/errorcallback \
xmlsecurity/source/xmlsec/saxhelper \
- xmlsecurity/source/xmlsec/serialnumberadapter \
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl \
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl \
xmlsecurity/source/xmlsec/xmlsec_init \
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
deleted file mode 100644
index c00803deb16c..000000000000
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ /dev/null
@@ -1,81 +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 .
- */
-
-#include <sal/config.h>
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <biginteger.hxx>
-
-#include "serialnumberadapter.hxx"
-
-namespace {
-
-class Service:
- public cppu::WeakImplHelper<css::lang::XServiceInfo>
-{
-public:
- Service() {}
- Service(const Service&) = delete;
- Service& operator=(const Service&) = delete;
-
-private:
- virtual ~Service() override {}
-
- virtual OUString SAL_CALL getImplementationName() override
- { return xml_security::serial_number_adapter::implementationName(); }
-
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
- { return cppu::supportsService(this, ServiceName); }
-
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
- { return xml_security::serial_number_adapter::serviceNames(); }
-};
-
-}
-
-css::uno::Reference< css::uno::XInterface >
-xml_security::serial_number_adapter::create(
- css::uno::Reference< css::uno::XComponentContext > const &)
-{
- return static_cast< cppu::OWeakObject * >(new Service);
-}
-
-OUString xml_security::serial_number_adapter::implementationName()
-{
- return OUString("com.sun.star.comp.security.SerialNumberAdapter");
-}
-
-css::uno::Sequence< OUString >
-xml_security::serial_number_adapter::serviceNames()
-{
- css::uno::Sequence< OUString > s { "com.sun.star.security.SerialNumberAdapter" };
- return s;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
deleted file mode 100644
index e6ddc0dad1fa..000000000000
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
+++ /dev/null
@@ -1,49 +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 INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX
-
-#include <sal/config.h>
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star { namespace uno {
- class XComponentContext;
- class XInterface;
-} } } }
-
-namespace xml_security { namespace serial_number_adapter {
-
-css::uno::Reference< css::uno::XInterface > create(
- css::uno::Reference< css::uno::XComponentContext > const &);
-
-/// @throws css::uno::RuntimeException
-OUString implementationName();
-
-/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > serviceNames();
-
-} }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index edc0a3a6e97d..50cd2981d58a 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -22,7 +22,6 @@
#include <cppuhelper/factory.hxx>
-#include "serialnumberadapter.hxx"
#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
#include "xsec_xmlsec.hxx"
@@ -71,13 +70,6 @@ SAL_DLLPUBLIC_EXPORT void* xsec_xmlsec_component_getFactory( const sal_Char* pIm
OUString::createFromAscii( pImplName ),
XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() );
}
- else if( xml_security::serial_number_adapter::implementationName().equalsAscii( pImplName ) )
- {
- xFactory = ::cppu::createSingleComponentFactory(
- xml_security::serial_number_adapter::create,
- OUString::createFromAscii( pImplName ),
- xml_security::serial_number_adapter::serviceNames() );
- }
}
if( xFactory.is() ) {
More information about the Libreoffice-commits
mailing list