[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_fw.mk xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/Library_xsec_fw.mk                  |    1 
 xmlsecurity/source/framework/xsec_framework.cxx |  151 ------------------------
 2 files changed, 152 deletions(-)

New commits:
commit 50669de68785d61534c4c3fe101fd8e1d12fae65
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Feb 2 09:15:48 2017 +0100

    xmlsecurity: remove unused xsec_fw_component_getFactory()
    
    No longer needed since commit a4af8986c94ff2d1bea0c21f798330efcc97b133
    ([API CHANGE] offapi: remove unused xsec_fw UNO services, 2017-01-26).
    
    Change-Id: I428c07bfe2846cdc54b35a62554a21197e62245f

diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index 8b83c70..3a7440d 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_fw,\
 	xmlsecurity/source/framework/signatureverifierimpl \
 	xmlsecurity/source/framework/xmlencryptiontemplateimpl \
 	xmlsecurity/source/framework/xmlsignaturetemplateimpl \
-	xmlsecurity/source/framework/xsec_framework \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
deleted file mode 100644
index 2afd010..0000000
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ /dev/null
@@ -1,151 +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 <osl/mutex.hxx>
-#include <osl/thread.h>
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "decryptorimpl.hxx"
-#include "encryptorimpl.hxx"
-#include "framework/signaturecreatorimpl.hxx"
-#include "framework/signatureverifierimpl.hxx"
-#include "framework/saxeventkeeperimpl.hxx"
-#include "xmlencryptiontemplateimpl.hxx"
-#include "xmlsignaturetemplateimpl.hxx"
-
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
-{
-    void * pRet = nullptr;
-
-    //Decryptor
-    OUString implName = OUString::createFromAscii( pImplName );
-    if ( pServiceManager && implName.equals(DecryptorImpl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-            static_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString::createFromAscii( pImplName ),
-            DecryptorImpl_createInstance, DecryptorImpl_getSupportedServiceNames() ) );
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //Encryptor
-    if ( pServiceManager && implName.equals(EncryptorImpl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-            static_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString::createFromAscii( pImplName ),
-            EncryptorImpl_createInstance, EncryptorImpl_getSupportedServiceNames() ) );
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //SignatureCreator
-    if ( pServiceManager && implName.equals(SignatureCreatorImpl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-            static_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString::createFromAscii( pImplName ),
-            SignatureCreatorImpl_createInstance, SignatureCreatorImpl_getSupportedServiceNames() ) );
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //SignatureVerifier
-    if ( pServiceManager && implName.equals(SignatureVerifierImpl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-            static_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString::createFromAscii( pImplName ),
-            SignatureVerifierImpl_createInstance, SignatureVerifierImpl_getSupportedServiceNames() ) );
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //SAXEventKeeper
-    if ( pServiceManager && implName.equals(SAXEventKeeperImpl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-            static_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString::createFromAscii( pImplName ),
-            SAXEventKeeperImpl_createInstance, SAXEventKeeperImpl_getSupportedServiceNames() ) );
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //XMLSignatureTemplate
-    if ( pServiceManager && implName.equals( XMLSignatureTemplateImpl::impl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory = XMLSignatureTemplateImpl::impl_createFactory(
-                static_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    //XMLEncryptionTemplate
-    if ( pServiceManager && implName.equals( XMLEncryptionTemplateImpl::impl_getImplementationName()) )
-    {
-        Reference< XSingleServiceFactory > xFactory = XMLEncryptionTemplateImpl::impl_createFactory(
-                static_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-
-        if (xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    return pRet;
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */