From c0929d4b558137a20eff1366a4b8202063306f13 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Mon, 6 Jul 2020 18:51:10 +0200
Subject: [PATCH] embedserv: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I5f912ee625a37f64f9d9c35ccb13f995a56685c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 embedserv/Library_emser.mk          |  1 -
 embedserv/source/embed/register.cxx | 79 -----------------------------
 embedserv/source/embed/servprov.cxx | 11 ++++
 embedserv/util/emser.component      |  5 +-
 4 files changed, 14 insertions(+), 82 deletions(-)
 delete mode 100644 embedserv/source/embed/register.cxx

diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 559f8d713450..07f433da0116 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,emser,\
 	embedserv/source/embed/guid \
 	embedserv/source/embed/iipaobj \
 	embedserv/source/embed/intercept \
-	embedserv/source/embed/register \
 	embedserv/source/embed/servprov \
 	embedserv/source/embed/syswinwrapper \
 	embedserv/source/embed/tracker \
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
deleted file mode 100644
index 46b18d5fd949..000000000000
--- a/embedserv/source/embed/register.cxx
+++ /dev/null
@@ -1,79 +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 <servprov.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
-#include <rtl/ustring.h>
-#include <cppuhelper/factory.hxx>
-
-
-using namespace ::com::sun::star;
-
-/// @throws uno::Exception
-static uno::Reference<uno::XInterface> EmbedServer_createInstance(
-    const uno::Reference<lang::XMultiServiceFactory> & xSMgr)
-{
-    uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr );
-    return xService;
-}
-
-static OUString EmbedServer_getImplementationName() throw()
-{
-    return "com.sun.star.comp.ole.EmbedServer";
-
-}
-
-static uno::Sequence< OUString > EmbedServer_getSupportedServiceNames() throw()
-{
-    uno::Sequence<OUString> aServiceNames { "com.sun.star.document.OleEmbeddedServerRegistration" };
-    return aServiceNames;
-}
-
-extern "C" {
-
-SAL_DLLPUBLIC_EXPORT void * emser_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
-{
-    void * pRet = nullptr;
-
-    OUString aImplName( OUString::createFromAscii( pImplName ) );
-    uno::Reference< lang::XSingleServiceFactory > xFactory;
-
-    if(pServiceManager && aImplName.equals( EmbedServer_getImplementationName() ) )
-    {
-        xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>(pServiceManager),
-                                            EmbedServer_getImplementationName(),
-                                            EmbedServer_createInstance,
-                                            EmbedServer_getSupportedServiceNames() );
-    }
-
-    if (xFactory.is())
-    {
-        xFactory->acquire();
-        pRet = xFactory.get();
-    }
-
-    return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index ec7628bd3453..46454667a42c 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -21,6 +21,7 @@
 #include <servprov.hxx>
 #include <embeddoc.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
@@ -224,4 +225,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int /*f
     return NOERROR;
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+embedserv_EmbedServer(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const& )
+{
+    auto msf = uno::Reference<lang::XMultiServiceFactory>(context->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    return cppu::acquire(new EmbedServer_Impl(msf));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component
index 38f2a2eee4c0..29a28be56843 100644
--- a/embedserv/util/emser.component
+++ b/embedserv/util/emser.component
@@ -18,8 +18,9 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="emser" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.ole.EmbedServer">
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ole.EmbedServer"
+    constructor="embedserv_EmbedServer">
     <service name="com.sun.star.document.OleEmbeddedServerRegistration"/>
   </implementation>
 </component>