fdo#60698: Unify spl and spl_unx

Change-Id: Ifd328ff3ce12364e95d05405759df6588b3a86bc
Reviewed-on: https://gerrit.libreoffice.org/6503
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>

3 files changed, 0 insertions, 255 deletions

diff --git a/desktop/unx/splash/splash.component b/desktop/unx/splash/splash.component
deleted file mode 100644
index bf2f50317d41..000000000000
--- a/desktop/unx/splash/splash.component
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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/.
- *
--->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="splash"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.office.comp.PipeSplashScreen">
-    <service name="com.sun.star.office.PipeSplashScreen"/>
-  </implementation>
-</component>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
deleted file mode 100644
index 6e9dd6b5afa2..000000000000
--- a/desktop/unx/splash/unxsplash.cxx
+++ /dev/null
@@ -1,181 +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 "unxsplash.hxx"
-#include <stdio.h>
-#include <osl/process.h>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppuhelper/implementationentry.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/math.hxx>
-
-#define PIPE_ARG "--splash-pipe="
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::uno;
-
-namespace desktop
-{
-    UnxSplashScreen::UnxSplashScreen( const Reference< uno::XComponentContext >& xCtx )
-    : m_xCtx( xCtx ),
-      m_pOutFd( NULL )
-{
-}
-
-UnxSplashScreen::~UnxSplashScreen()
-{
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "UnxSplashScreen::~UnxSplashScreen()\n" );
-#endif
-
-    if ( m_pOutFd )
-    {
-        fclose( m_pOutFd );
-        m_pOutFd = NULL;
-    }
-}
-
-void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ )
-    throw ( RuntimeException )
-{
-}
-
-void SAL_CALL UnxSplashScreen::end()
-    throw ( RuntimeException )
-{
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "UnxSplashScreen::end()\n" );
-#endif
-    if( !m_pOutFd )
-        return;
-
-    fprintf( m_pOutFd, "end\n" );
-    fflush( m_pOutFd );
-}
-
-void SAL_CALL UnxSplashScreen::reset()
-    throw ( RuntimeException )
-{
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "UnxSplashScreen::reset()\n" );
-#endif
-    if( !m_pOutFd )
-        return;
-
-    fprintf( m_pOutFd, "restart\n" );
-    fflush( m_pOutFd );
-}
-
-void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
-    throw ( RuntimeException )
-{
-    // TODO?
-}
-
-void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
-    throw ( RuntimeException )
-{
-    if ( m_pOutFd )
-    {
-        fprintf( m_pOutFd, "%" SAL_PRIdINT32 "%%\n", nValue );
-        fflush( m_pOutFd );
-    }
-}
-
-// XInitialize
-void SAL_CALL
-UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& )
-    throw ( RuntimeException )
-{
-    for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
-    {
-        OUString aArg;
-        if ( osl_getCommandArg( i, &aArg.pData ) )
-            break;
-        if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) )
-        {
-            OUString aNum = aArg.copy( sizeof( PIPE_ARG ) - 1 );
-            int fd = aNum.toInt32();
-            m_pOutFd = fdopen( fd, "w" );
-#if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n",
-                     fd, OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ).getStr(),
-                     m_pOutFd );
-#endif
-        }
-    }
-}
-}
-
-using namespace desktop;
-
-// get service instance...
-static uno::Reference< uno::XInterface > m_xINSTANCE;
-
-uno::Reference< uno::XInterface > SAL_CALL UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception )
-{
-    static osl::Mutex m_aMutex;
-    if ( !m_xINSTANCE.is() )
-    {
-        osl::MutexGuard guard( m_aMutex );
-        if ( !m_xINSTANCE.is() )
-            m_xINSTANCE = (cppu::OWeakObject*) new UnxSplashScreen( xCtx );
-    }
-
-    return m_xINSTANCE;
-}
-
-OUString UnxSplash_getImplementationName()
-{
-    return OUString( "com.sun.star.office.comp.PipeSplashScreen" );
-}
-
-uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw()
-{
-    const OUString aServiceName( "com.sun.star.office.PipeSplashScreen" );
-    const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
-
-::cppu::ImplementationEntry aEntries[] =
-{
-    {
-        UnxSplash_createInstance, UnxSplash_getImplementationName,
-        UnxSplash_getSupportedServiceNames,
-        ::cppu::createSingleComponentFactory,
-        0, 0
-    },
-    { 0, 0, 0, 0, 0, 0 }
-};
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL splash_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
-{
-    return ::cppu::component_getFactoryHelper( pImplName, pServiceManager,
-                                               pRegistryKey, aEntries );
-}
-
-} // extern "C"
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx
deleted file mode 100644
index ecf78a6728cc..000000000000
--- a/desktop/unx/splash/unxsplash.hxx
+++ /dev/null
@@ -1,59 +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/.
- */
-#include <stdio.h>
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <osl/mutex.hxx>
-#include <rtl/bootstrap.hxx>
-
-namespace desktop {
-
-class  UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization >
-{
-private:
-    // don't allow anybody but ourselves to create instances of this class
-    UnxSplashScreen( const UnxSplashScreen& );
-    UnxSplashScreen( void );
-    UnxSplashScreen operator =( const UnxSplashScreen& );
-
-    virtual ~UnxSplashScreen();
-
-    static  UnxSplashScreen *m_pINSTANCE;
-
-    static osl::Mutex m_aMutex;
-    css::uno::Reference< css::uno::XComponentContext > m_xCtx;
-
-    FILE *m_pOutFd;
-
-public:
-    UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx );
-
-    // XStatusIndicator
-    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL end() throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException );
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException );
-
-    // XInitialize
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */