xmlsecurity: instantiate SignatureCreatorImpl directly in XSecController

Going via UNO for a class in the same module is an overkill.

Change-Id: I3a24bc770e40be5b0a6fc34206e92f968de060ae
Reviewed-on: https://gerrit.libreoffice.org/32271
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

3 files changed, 2 insertions, 116 deletions

diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 905db95a6787..e9269c267c20 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "signaturecreatorimpl.hxx"
+#include "framework/signaturecreatorimpl.hxx"
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
deleted file mode 100644
index 81a8fc3f2731..000000000000
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ /dev/null
@@ -1,114 +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_SIGNATURECREATORIMPL_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_SIGNATURECREATORIMPL_HXX
-
-#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp>
-#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.hpp>
-#include <com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.hpp>
-#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase.hxx>
-
-#include "framework/signatureengine.hxx"
-
-typedef cppu::ImplInheritanceHelper
-<
-    SignatureEngine,
-    css::xml::crypto::sax::XBlockerMonitor,
-    css::xml::crypto::sax::XSignatureCreationResultBroadcaster,
-    css::lang::XInitialization,
-    css::lang::XServiceInfo
-> SignatureCreatorImpl_Base;
-
-class SignatureCreatorImpl : public SignatureCreatorImpl_Base
-/****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl *******************
- *
- *   NAME
- *  SignatureCreatorImpl -- generates a signature
- *
- *   FUNCTION
- *  Collects all resources for a signature generation, then generates the
- *  signature by invoking a xmlsec-based signature bridge component.
- ******************************************************************************/
-{
-private:
-    /*
-     * the Id of template blocker.
-     */
-    sal_Int32 m_nIdOfBlocker;
-
-    css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
-
-    virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
-    virtual void clearUp( ) const override;
-    virtual bool checkReady() const override;
-    virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate)
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
-
-public:
-    explicit SignatureCreatorImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext );
-    virtual ~SignatureCreatorImpl() override;
-
-    /* XBlockerMonitor */
-    virtual void SAL_CALL setBlockerId( sal_Int32 id )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-
-    /* XSignatureCreationResultBroadcaster */
-    void SAL_CALL addSignatureCreationResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-
-    void SAL_CALL removeSignatureCreationResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    /* XInitialization */
-    virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-
-    /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-};
-
-OUString SignatureCreatorImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
-
-css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL SignatureCreatorImpl_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index bfe132efce32..2afd010fee56 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -24,7 +24,7 @@
 
 #include "decryptorimpl.hxx"
 #include "encryptorimpl.hxx"
-#include "signaturecreatorimpl.hxx"
+#include "framework/signaturecreatorimpl.hxx"
 #include "framework/signatureverifierimpl.hxx"
 #include "framework/saxeventkeeperimpl.hxx"
 #include "xmlencryptiontemplateimpl.hxx"