[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_fw.mk xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Mar 10 11:09:11 UTC 2017
xmlsecurity/Library_xsec_fw.mk | 1
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 111 -------------
xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 92 ----------
3 files changed, 204 deletions(-)
New commits:
commit 90d88b6e465b82e318eadf6897b54180fb5154e0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 10 09:15:27 2017 +0100
xmlsecurity: remove unused XMLEncryptionTemplateImpl
Not needed since commit 0649622956431e0a1955cb80d1175025401ab5e5
(loplugin:unusedmethods, 2017-02-21).
Change-Id: I5e8699174202c17309198e541dc904dc1b47a534
Reviewed-on: https://gerrit.libreoffice.org/35031
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index b8ebdb2..b6fa2dc 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_fw,\
xmlsecurity/source/framework/signaturecreatorimpl \
xmlsecurity/source/framework/signatureengine \
xmlsecurity/source/framework/signatureverifierimpl \
- xmlsecurity/source/framework/xmlencryptiontemplateimpl \
xmlsecurity/source/framework/xmlsignaturetemplateimpl \
))
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
deleted file mode 100644
index 09201d9..0000000
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ /dev/null
@@ -1,111 +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 <rtl/uuid.h>
-#include "xmlencryptiontemplateimpl.hxx"
-
-using namespace ::com::sun::star::uno ;
-using ::com::sun::star::lang::XMultiServiceFactory ;
-using ::com::sun::star::lang::XSingleServiceFactory ;
-
-using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
-using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
-
-XMLEncryptionTemplateImpl::XMLEncryptionTemplateImpl()
- : m_xTemplate( nullptr ),
- m_xTarget( nullptr ),
- m_nStatus ( css::xml::crypto::SecurityOperationStatus_UNKNOWN ) {
-}
-
-XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() {
-}
-
-/* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
-{
- m_xTemplate = aTemplate ;
-}
-
-/* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTemplate()
-{
- return m_xTemplate ;
-}
-
-/* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget ) {
- m_xTarget = aTarget ;
-}
-
-/* XXMLEncryptionTemplate */
-Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTarget()
-{
- return m_xTarget ;
-}
-
-void SAL_CALL XMLEncryptionTemplateImpl::setStatus(
- css::xml::crypto::SecurityOperationStatus status )
-{
- m_nStatus = status;
-}
-
-css::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus( )
-{
- return m_nStatus;
-}
-
-/* XServiceInfo */
-OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() {
- return impl_getImplementationName() ;
-}
-
-/* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) {
- Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
- const OUString* pArray = seqServiceNames.getConstArray() ;
- for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
- if( *( pArray + i ) == serviceName )
- return true ;
- }
- return false ;
-}
-
-/* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() {
- return impl_getSupportedServiceNames() ;
-}
-
-//Helper for XServiceInfo
-Sequence< OUString > XMLEncryptionTemplateImpl::impl_getSupportedServiceNames() {
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
- Sequence<OUString> seqServiceNames { "com.sun.star.xml.crypto.XMLEncryptionTemplate" };
- return seqServiceNames;
-}
-
-OUString XMLEncryptionTemplateImpl::impl_getImplementationName() {
- return OUString("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl") ;
-}
-
-//Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
- return Reference< XInterface >( *new XMLEncryptionTemplateImpl ) ;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
deleted file mode 100644
index a9bbf47..0000000
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ /dev/null
@@ -1,92 +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_FRAMEWORK_XMLENCRYPTIONTEMPLATEIMPL_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_XMLENCRYPTIONTEMPLATEIMPL_HXX
-
-#include <sal/config.h>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-
-class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper<
- css::xml::crypto::XXMLEncryptionTemplate ,
- css::lang::XServiceInfo >
-{
- private:
- css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xTemplate;
- css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > m_xTarget;
- css::xml::crypto::SecurityOperationStatus m_nStatus;
-
- public:
- explicit XMLEncryptionTemplateImpl();
- virtual ~XMLEncryptionTemplateImpl() override;
-
- //Methods from XXMLEncryptionTemplate
- virtual void SAL_CALL setTemplate(
- const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
- ) override;
-
- virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
- ) override;
-
- virtual void SAL_CALL setTarget(
- const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
- ) override;
-
- virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget(
- ) override ;
-
- virtual void SAL_CALL setStatus(
- css::xml::crypto::SecurityOperationStatus status ) override;
- virtual css::xml::crypto::SecurityOperationStatus
- SAL_CALL getStatus( ) override;
-
- //Methods from XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override ;
-
- virtual sal_Bool SAL_CALL supportsService(
- const OUString& ServiceName
- ) override ;
-
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ;
-
- //Helper for XServiceInfo
- static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
-
- /// @throws css::uno::RuntimeException
- static OUString impl_getImplementationName() ;
-
- //Helper for registry
- /// @throws css::uno::RuntimeException
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
-};
-
-#endif // _XMLENCRYPTIONTEMPLATE_XMLSECIMPL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list