fdo#60698: Merge all libs of io...

creating the libio. All these libraries are always used together, so we can put them
together in one single library.

This save almost 500 kb of the size of the final library.

Change-Id: Ib32fec36cc4eb80ca646ce472c1f1bcdd98ac62b
Reviewed-on: https://gerrit.libreoffice.org/6567
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

7 files changed, 4 insertions, 196 deletions

diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
deleted file mode 100644
index 6fb39e7ce0c7..000000000000
--- a/io/source/stm/factreg.cxx
+++ /dev/null
@@ -1,89 +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/diagnose.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
-
-#include <com/sun/star/registry/XRegistryKey.hpp>
-
-using namespace ::rtl;
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-#include "factreg.hxx"
-
-using namespace io_stm;
-
-static const struct ImplementationEntry g_entries[] =
-{
-    {
-        OPipeImpl_CreateInstance, OPipeImpl_getImplementationName ,
-        OPipeImpl_getSupportedServiceNames, createSingleComponentFactory ,
-        0, 0
-    },
-    {
-        OPumpImpl_CreateInstance, OPumpImpl_getImplementationName ,
-        OPumpImpl_getSupportedServiceNames, createSingleComponentFactory ,
-        0, 0
-    },
-    {
-        ODataInputStream_CreateInstance, ODataInputStream_getImplementationName,
-        ODataInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    {
-        ODataOutputStream_CreateInstance, ODataOutputStream_getImplementationName,
-        ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    {
-        OObjectInputStream_CreateInstance, OObjectInputStream_getImplementationName,
-        OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    {
-        OObjectOutputStream_CreateInstance, OObjectOutputStream_getImplementationName,
-        OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    {
-        OMarkableInputStream_CreateInstance, OMarkableInputStream_getImplementationName,
-        OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    {
-        OMarkableOutputStream_CreateInstance, OMarkableOutputStream_getImplementationName,
-        OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        0, 0
-    },
-    { 0, 0, 0, 0, 0, 0 }
-
-};
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-    return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx
deleted file mode 100644
index c4548b2d78a7..000000000000
--- a/io/source/stm/factreg.hxx
+++ /dev/null
@@ -1,57 +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 .
- */
-
-namespace io_stm {
-
-// OPipeImpl
-Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    OPipeImpl_getImplementationName();
-Sequence<OUString> OPipeImpl_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    ODataInputStream_getImplementationName();
-Sequence<OUString> ODataInputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString ODataOutputStream_getImplementationName();
-Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString OMarkableOutputStream_getImplementationName();
-Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString    OMarkableInputStream_getImplementationName() ;
-Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
-OUString OObjectOutputStream_getImplementationName();
-Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
-OUString    OObjectInputStream_getImplementationName() ;
-Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void);
-
-Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
-OUString OPumpImpl_getImplementationName();
-Sequence<OUString> OPumpImpl_getSupportedServiceNames(void);
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index dcc471673d99..b3601b55a9fb 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-#include "factreg.hxx"
+#include "services.hxx"
 
 namespace io_stm {
 
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 90ab99931359..44baddc36d9b 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -47,8 +47,8 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
+#include "services.hxx"
 #include "streamhelper.hxx"
-#include "factreg.hxx"
 
 namespace io_stm {
 
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 2fdf85d742ce..b59496722008 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 
-#include "factreg.hxx"
+#include "services.hxx"
 #include "streamhelper.hxx"
 
 // Implementation and service names
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 6224f9248645..72f1570f23cd 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::io;
 
-#include "factreg.hxx"
+#include "services.hxx"
 
 namespace io_stm {
 
diff --git a/io/source/stm/streams.component b/io/source/stm/streams.component
deleted file mode 100644
index 7de1ebb6ba2b..000000000000
--- a/io/source/stm/streams.component
+++ /dev/null
@@ -1,46 +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/.
- *
- * 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 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="streams"
-    xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.io.Pump">
-    <service name="com.sun.star.io.Pump"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.DataInputStream">
-    <service name="com.sun.star.io.DataInputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.DataOutputStream">
-    <service name="com.sun.star.io.DataOutputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.MarkableInputStream">
-    <service name="com.sun.star.io.MarkableInputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.MarkableOutputStream">
-    <service name="com.sun.star.io.MarkableOutputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.ObjectInputStream">
-    <service name="com.sun.star.io.ObjectInputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.ObjectOutputStream">
-    <service name="com.sun.star.io.ObjectOutputStream"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.io.stm.Pipe">
-    <service name="com.sun.star.io.Pipe"/>
-  </implementation>
-</component>