Skip to content

C
core
Kaydet (Commit) 3a009c42 authored tarafından Marcos Paulo de Souza's avatar Marcos Paulo de Souza Kaydeden (comit) Stephan Bergmann
Dosyalara gözat
Seçenekler

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/6567Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 5cf62a6a
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 401 deletions
Repository.mk
Dosyayı görüntüle @ 3a009c42
...@@ -467,13 +467,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ ...@@ -467,13 +467,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
acceptor \
binaryurp \ binaryurp \
bootstrap \ bootstrap \
connector \
introspection \ introspection \
invocadapt \ invocadapt \
invocation \ invocation \
io \
$(if $(ENABLE_JAVA),javaloader) \ $(if $(ENABLE_JAVA),javaloader) \
$(if $(ENABLE_JAVA),javavm) \ $(if $(ENABLE_JAVA),javavm) \
$(if $(ENABLE_JAVA),jvmaccess) \ $(if $(ENABLE_JAVA),jvmaccess) \
...@@ -485,10 +484,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ ...@@ -485,10 +484,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
sal_textenc \ sal_textenc \
stocservices \ stocservices \
store \ store \
streams \
$(if $(ENABLE_JAVA),sunjavaplugin) \ $(if $(ENABLE_JAVA),sunjavaplugin) \
textinstream \
textoutstream \
unoidl \ unoidl \
uuresolver \ uuresolver \
xmlreader \ xmlreader \
......
io/Library_acceptor.mk deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Library_Library,acceptor))
$(eval $(call gb_Library_use_external,acceptor,boost_headers))
$(eval $(call gb_Library_use_udk_api,acceptor))
$(eval $(call gb_Library_use_libraries,acceptor,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor))
$(eval $(call gb_Library_add_exception_objects,acceptor,\
io/source/acceptor/acc_pipe \
io/source/acceptor/acc_socket \
io/source/acceptor/acceptor \
))
# vim:set noet sw=4 ts=4:
io/Library_connector.mk deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Library_Library,connector))
$(eval $(call gb_Library_use_external,connector,boost_headers))
$(eval $(call gb_Library_use_udk_api,connector))
$(eval $(call gb_Library_use_libraries,connector,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector))
$(eval $(call gb_Library_add_exception_objects,connector,\
io/source/connector/connector \
io/source/connector/ctr_pipe \
io/source/connector/ctr_socket \
))
# vim:set noet sw=4 ts=4:
io/Library_streams.mk → io/Library_io.mk
Dosyayı görüntüle @ 3a009c42
...@@ -7,28 +7,41 @@ ...@@ -7,28 +7,41 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_Library_Library,streams)) $(eval $(call gb_Library_Library,io))
$(eval $(call gb_Library_use_external,streams,boost_headers)) $(eval $(call gb_Library_use_external,io,boost_headers))
$(eval $(call gb_Library_use_udk_api,streams)) $(eval $(call gb_Library_use_udk_api,io))
$(eval $(call gb_Library_use_libraries,streams,\ $(eval $(call gb_Library_use_libraries,io,\
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) $(eval $(call gb_Library_set_componentfile,io,io/source/io))
$(eval $(call gb_Library_add_exception_objects,streams,\ $(eval $(call gb_Library_set_include,io,\
io/source/stm/factreg \ -I$(SRCDIR)/io/source \
$$(INCLUDE) \
))
$(eval $(call gb_Library_add_exception_objects,io,\
io/source/services \
io/source/acceptor/acc_pipe \
io/source/acceptor/acc_socket \
io/source/acceptor/acceptor \
io/source/connector/connector \
io/source/connector/ctr_pipe \
io/source/connector/ctr_socket \
io/source/stm/odata \ io/source/stm/odata \
io/source/stm/omark \ io/source/stm/omark \
io/source/stm/opipe \ io/source/stm/opipe \
io/source/stm/opump \ io/source/stm/opump \
io/source/stm/streamhelper \ io/source/stm/streamhelper \
io/source/TextInputStream/TextInputStream \
io/source/TextOutputStream/TextOutputStream \
)) ))
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:
io/Library_textinstream.mk deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Library_Library,textinstream))
$(eval $(call gb_Library_use_api,textinstream,\
udkapi \
))
$(eval $(call gb_Library_use_libraries,textinstream,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream))
$(eval $(call gb_Library_add_exception_objects,textinstream,\
io/source/TextInputStream/TextInputStream \
))
# vim:set noet sw=4 ts=4:
io/Library_textoutstream.mk deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Library_Library,textoutstream))
$(eval $(call gb_Library_use_api,textoutstream,\
udkapi \
))
$(eval $(call gb_Library_use_libraries,textoutstream,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream))
$(eval $(call gb_Library_add_exception_objects,textoutstream,\
io/source/TextOutputStream/TextOutputStream \
))
# vim:set noet sw=4 ts=4:
io/Module_io.mk
Dosyayı görüntüle @ 3a009c42
...@@ -10,11 +10,7 @@ ...@@ -10,11 +10,7 @@
$(eval $(call gb_Module_Module,io)) $(eval $(call gb_Module_Module,io))
$(eval $(call gb_Module_add_targets,io,\ $(eval $(call gb_Module_add_targets,io,\
Library_acceptor \ Library_io \
Library_connector \
Library_streams \
Library_textinstream \
Library_textoutstream \
)) ))
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:
io/source/TextInputStream/TextInputStream.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <com/sun/star/io/XTextInputStream2.hpp> #include <com/sun/star/io/XTextInputStream2.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include "services.hxx"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream"
#define SERVICE_NAME "com.sun.star.io.TextInputStream" #define SERVICE_NAME "com.sun.star.io.TextInputStream"
...@@ -463,22 +464,4 @@ Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw() ...@@ -463,22 +464,4 @@ Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw()
} }
using namespace io_TextInputStream;
static const struct ImplementationEntry g_entries[] =
{
{
TextInputStream_CreateInstance, TextInputStream_getImplementationName ,
TextInputStream_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{ 0, 0, 0, 0, 0, 0 }
};
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL textinstream_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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
io/source/TextInputStream/textinstream.component deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
<?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="textinstream"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.TextInputStream">
<service name="com.sun.star.io.TextInputStream"/>
</implementation>
</component>
io/source/TextOutputStream/TextOutputStream.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <com/sun/star/io/XTextOutputStream2.hpp> #include <com/sun/star/io/XTextOutputStream2.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include "services.hxx"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextOutputStream" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextOutputStream"
#define SERVICE_NAME "com.sun.star.io.TextOutputStream" #define SERVICE_NAME "com.sun.star.io.TextOutputStream"
...@@ -278,22 +279,4 @@ Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw() ...@@ -278,22 +279,4 @@ Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw()
} }
using namespace io_TextOutputStream;
static const struct ImplementationEntry g_entries[] =
{
{
TextOutputStream_CreateInstance, TextOutputStream_getImplementationName ,
TextOutputStream_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{ 0, 0, 0, 0, 0, 0 }
};
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL textoutstream_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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
io/source/TextOutputStream/textoutstream.component deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
<?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="textoutstream"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.TextOutputStream">
<service name="com.sun.star.io.TextOutputStream"/>
</implementation>
</component>
io/source/acceptor/acceptor.component deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
<?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="acceptor"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Acceptor">
<service name="com.sun.star.connection.Acceptor"/>
</implementation>
</component>
io/source/acceptor/acceptor.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <com/sun/star/connection/XAcceptor.hpp> #include <com/sun/star/connection/XAcceptor.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include "services.hxx"
#include "acceptor.hxx" #include "acceptor.hxx"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.Acceptor" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.Acceptor"
...@@ -303,22 +304,4 @@ namespace io_acceptor ...@@ -303,22 +304,4 @@ namespace io_acceptor
} }
using namespace io_acceptor;
static const struct ImplementationEntry g_entries[] =
{
{
acceptor_CreateInstance, acceptor_getImplementationName ,
acceptor_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{ 0, 0, 0, 0, 0, 0 }
};
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL acceptor_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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
io/source/connector/connector.component deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
<?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="connector"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Connector">
<service name="com.sun.star.connection.Connector"/>
</implementation>
</component>
io/source/connector/connector.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/connection/XConnector.hpp> #include <com/sun/star/connection/XConnector.hpp>
#include "services.hxx"
#include "connector.hxx" #include "connector.hxx"
#define IMPLEMENTATION_NAME "com.sun.star.comp.io.Connector" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.Connector"
...@@ -208,22 +209,5 @@ namespace stoc_connector ...@@ -208,22 +209,5 @@ namespace stoc_connector
} }
using namespace stoc_connector;
static const struct ImplementationEntry g_entries[] =
{
{
connector_CreateInstance, connector_getImplementationName ,
connector_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{ 0, 0, 0, 0, 0, 0 }
};
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL connector_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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
io/source/stm/streams.component → io/source/io.component
Dosyayı görüntüle @ 3a009c42
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<component loader="com.sun.star.loader.SharedLibrary" prefix="streams" <component loader="com.sun.star.loader.SharedLibrary" prefix="io"
xmlns="http://openoffice.org/2010/uno-components"> xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.io.Pump"> <implementation name="com.sun.star.comp.io.Pump">
<service name="com.sun.star.io.Pump"/> <service name="com.sun.star.io.Pump"/>
...@@ -43,4 +43,16 @@ ...@@ -43,4 +43,16 @@
<implementation name="com.sun.star.comp.io.stm.Pipe"> <implementation name="com.sun.star.comp.io.stm.Pipe">
<service name="com.sun.star.io.Pipe"/> <service name="com.sun.star.io.Pipe"/>
</implementation> </implementation>
<implementation name="com.sun.star.comp.io.Acceptor">
<service name="com.sun.star.connection.Acceptor"/>
</implementation>
<implementation name="com.sun.star.comp.io.Connector">
<service name="com.sun.star.connection.Connector"/>
</implementation>
<implementation name="com.sun.star.comp.io.TextInputStream">
<service name="com.sun.star.io.TextInputStream"/>
</implementation>
<implementation name="com.sun.star.comp.io.TextOutputStream">
<service name="com.sun.star.io.TextOutputStream"/>
</implementation>
</component> </component>
io/source/stm/factreg.cxx → io/source/services.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -17,71 +17,87 @@ ...@@ -17,71 +17,87 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implementationentry.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include "services.hxx"
using namespace ::rtl; using namespace ::rtl;
using namespace ::cppu; using namespace ::cppu;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry; using namespace ::com::sun::star::registry;
#include "factreg.hxx"
using namespace io_stm;
static const struct ImplementationEntry g_entries[] = static const struct ImplementationEntry g_entries[] =
{ {
{ {
OPipeImpl_CreateInstance, OPipeImpl_getImplementationName , io_acceptor::acceptor_CreateInstance, io_acceptor::acceptor_getImplementationName ,
OPipeImpl_getSupportedServiceNames, createSingleComponentFactory , io_acceptor::acceptor_getSupportedServiceNames, createSingleComponentFactory ,
0, 0 0, 0
}, },
{ {
OPumpImpl_CreateInstance, OPumpImpl_getImplementationName , stoc_connector::connector_CreateInstance, stoc_connector::connector_getImplementationName ,
OPumpImpl_getSupportedServiceNames, createSingleComponentFactory , stoc_connector::connector_getSupportedServiceNames, createSingleComponentFactory ,
0, 0 0, 0
}, },
{ {
ODataInputStream_CreateInstance, ODataInputStream_getImplementationName, io_stm::OPipeImpl_CreateInstance, io_stm::OPipeImpl_getImplementationName ,
ODataInputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::OPipeImpl_getSupportedServiceNames, createSingleComponentFactory ,
0, 0 0, 0
}, },
{ {
ODataOutputStream_CreateInstance, ODataOutputStream_getImplementationName, io_stm::OPumpImpl_CreateInstance, io_stm::OPumpImpl_getImplementationName ,
ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::OPumpImpl_getSupportedServiceNames, createSingleComponentFactory ,
0, 0 0, 0
}, },
{ {
OObjectInputStream_CreateInstance, OObjectInputStream_getImplementationName, io_stm::ODataInputStream_CreateInstance, io_stm::ODataInputStream_getImplementationName,
OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::ODataInputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0 0, 0
}, },
{ {
OObjectOutputStream_CreateInstance, OObjectOutputStream_getImplementationName, io_stm::ODataOutputStream_CreateInstance, io_stm::ODataOutputStream_getImplementationName,
OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0 0, 0
}, },
{ {
OMarkableInputStream_CreateInstance, OMarkableInputStream_getImplementationName, io_stm::OObjectInputStream_CreateInstance, io_stm::OObjectInputStream_getImplementationName,
OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0 0, 0
}, },
{ {
OMarkableOutputStream_CreateInstance, OMarkableOutputStream_getImplementationName, io_stm::OObjectOutputStream_CreateInstance, io_stm::OObjectOutputStream_getImplementationName,
OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory, io_stm::OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0 0, 0
}, },
{ 0, 0, 0, 0, 0, 0 } {
io_stm::OMarkableInputStream_CreateInstance, io_stm::OMarkableInputStream_getImplementationName,
io_stm::OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0
},
{
io_stm::OMarkableOutputStream_CreateInstance, io_stm::OMarkableOutputStream_getImplementationName,
io_stm::OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory,
0, 0
},
{
io_TextInputStream::TextInputStream_CreateInstance, io_TextInputStream::TextInputStream_getImplementationName ,
io_TextInputStream::TextInputStream_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{
io_TextOutputStream::TextOutputStream_CreateInstance, io_TextOutputStream::TextOutputStream_getImplementationName ,
io_TextOutputStream::TextOutputStream_getSupportedServiceNames, createSingleComponentFactory ,
0, 0
},
{0, 0, 0, 0, 0, 0}
}; };
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL streams_component_getFactory( extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL io_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
} }
......
io/source/services.hxx 0 → 100644
Dosyayı görüntüle @ 3a009c42
/* -*- 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_IO_SOURCE_SERVICES_HXX
#define INCLUDED_IO_SOURCE_SERVICES_HXX
#include "sal/config.h"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/Sequence.hxx"
#include "rtl/ustring.hxx"
#include "sal/types.h"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
namespace io_acceptor{
Reference< XInterface > SAL_CALL acceptor_CreateInstance( const Reference< XComponentContext > & xCtx);
OUString acceptor_getImplementationName();
Sequence< OUString > acceptor_getSupportedServiceNames();
}
namespace stoc_connector {
Reference< XInterface > SAL_CALL connector_CreateInstance( const Reference< XComponentContext > & xCtx);
OUString connector_getImplementationName();
Sequence< OUString > connector_getSupportedServiceNames();
}
namespace io_TextInputStream {
Reference< XInterface > SAL_CALL TextInputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &);
OUString TextInputStream_getImplementationName();
Sequence< OUString > TextInputStream_getSupportedServiceNames();
}
namespace io_TextOutputStream {
Reference< XInterface > SAL_CALL TextOutputStream_CreateInstance(SAL_UNUSED_PARAMETER const Reference< XComponentContext > &);
OUString TextOutputStream_getImplementationName() SAL_THROW( () );
Sequence< OUString > TextOutputStream_getSupportedServiceNames();
}
namespace io_stm {
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);
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
io/source/stm/factreg.hxx deleted 100644 → 0
Dosyayı görüntüle @ 5cf62a6a
/* -*- 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: */
io/source/stm/odata.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -45,7 +45,7 @@ using namespace ::com::sun::star::io; ...@@ -45,7 +45,7 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
#include "factreg.hxx" #include "services.hxx"
namespace io_stm { namespace io_stm {
......
io/source/stm/omark.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -47,8 +47,8 @@ using namespace ::com::sun::star::io; ...@@ -47,8 +47,8 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
#include "services.hxx"
#include "streamhelper.hxx" #include "streamhelper.hxx"
#include "factreg.hxx"
namespace io_stm { namespace io_stm {
......
io/source/stm/opipe.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno; ...@@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io; using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
#include "factreg.hxx" #include "services.hxx"
#include "streamhelper.hxx" #include "streamhelper.hxx"
// Implementation and service names // Implementation and service names
......
io/source/stm/opump.cxx
Dosyayı görüntüle @ 3a009c42
...@@ -48,7 +48,7 @@ using namespace com::sun::star::lang; ...@@ -48,7 +48,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry; using namespace com::sun::star::registry;
using namespace com::sun::star::io; using namespace com::sun::star::io;
#include "factreg.hxx" #include "services.hxx"
namespace io_stm { namespace io_stm {
......
ure/Rdb_ure.mk
Dosyayı görüntüle @ 3a009c42
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
$(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb)) $(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
$(eval $(call gb_Rdb_add_components,ure/services,\ $(eval $(call gb_Rdb_add_components,ure/services,\
$(if $(filter IOS,$(OS)),, \
io/source/acceptor/acceptor \
io/source/connector/connector) \
binaryurp/source/binaryurp \ binaryurp/source/binaryurp \
io/source/io \
stoc/util/bootstrap \ stoc/util/bootstrap \
stoc/source/inspect/introspection \ stoc/source/inspect/introspection \
stoc/source/invocation_adapterfactory/invocadapt \ stoc/source/invocation_adapterfactory/invocadapt \
...@@ -22,9 +20,6 @@ $(eval $(call gb_Rdb_add_components,ure/services,\ ...@@ -22,9 +20,6 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
stoc/source/proxy_factory/proxyfac \ stoc/source/proxy_factory/proxyfac \
stoc/source/corereflection/reflection \ stoc/source/corereflection/reflection \
stoc/util/stocservices \ stoc/util/stocservices \
io/source/stm/streams \
io/source/TextInputStream/textinstream \
io/source/TextOutputStream/textoutstream \
remotebridges/source/unourl_resolver/uuresolver \ remotebridges/source/unourl_resolver/uuresolver \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment