[Libreoffice-commits] core.git: shell/Library_syssh.mk shell/source

[Noel Grandin (via logerrit)]

 shell/Library_syssh.mk             |    1 
 shell/source/win32/SysShExec.cxx   |    6 +++
 shell/source/win32/SysShentry.cxx  |   71 -------------------------------------
 shell/source/win32/syssh.component |    5 +-
 4 files changed, 9 insertions(+), 74 deletions(-)

New commits:
commit 9cc580922b36460f47846c17aaa1cf141564c7a7
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Tue Jul 21 12:04:04 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jul 21 14:41:24 2020 +0200

    shell/syssh: create instances with uno constructors
    
    See tdf#74608 for motivation.
    
    Change-Id: I0c46ef0e9be472b8fccc34376e9f1c23b0c07cb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99130
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 15406cb9c1ab..43d52ea2ee0c 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
 
 $(eval $(call gb_Library_add_exception_objects,syssh,\
 	shell/source/win32/SysShExec \
-	shell/source/win32/SysShentry \
 ))
 
 else # OS != WNT
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 3a788728b847..df5aee1a2ca7 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -409,4 +409,10 @@ css::uno::Sequence< OUString > SAL_CALL CSysShExec::getSupportedServiceNames(  )
     return { "com.sun.star.system.SystemShellExecute" };
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+shell_CSysShExec_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+    return cppu::acquire(new CSysShExec(context));
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
deleted file mode 100644
index 130ba8de7dd5..000000000000
--- a/shell/source/win32/SysShentry.cxx
+++ /dev/null
@@ -1,71 +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 <cppuhelper/factory.hxx>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include "SysShExec.hxx"
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-using namespace ::cppu;
-using com::sun::star::system::XSystemShellExecute;
-
-#define SYSSHEXEC_SERVICE_NAME  "com.sun.star.system.SystemShellExecute"
-#define SYSSHEXEC_IMPL_NAME     "com.sun.star.sys.shell.SystemShellExecute"
-
-namespace
-{
-    Reference< XInterface > createInstance( const Reference< XComponentContext >& xContext )
-    {
-        return Reference< XInterface >( static_cast< XSystemShellExecute* >( new CSysShExec(xContext) ) );
-    }
-}
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory(
-        const char* pImplName, void*, void* /*pRegistryKey*/ )
-{
-    void* pRet = nullptr;
-
-    if ( 0 == rtl_str_compare( pImplName, SYSSHEXEC_IMPL_NAME ) )
-    {
-        Sequence< OUString > aSNS { SYSSHEXEC_SERVICE_NAME };
-
-        Reference< XSingleComponentFactory > xFactory ( createSingleComponentFactory(
-            createInstance,
-            OUString::createFromAscii( pImplName ),
-            aSNS ) );
-        if ( xFactory.is() )
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component
index 9235d1d20f99..d5ddeaa716ad 100644
--- a/shell/source/win32/syssh.component
+++ b/shell/source/win32/syssh.component
@@ -18,8 +18,9 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="syssh" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.sys.shell.SystemShellExecute">
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.sys.shell.SystemShellExecute"
+    constructor="shell_CSysShExec_get_implementation">
     <service name="com.sun.star.system.SystemShellExecute"/>
   </implementation>
 </component>