Repository.mk | 6 - io/Library_acceptor.mk | 31 ------ io/Library_connector.mk | 31 ------ io/Library_io.mk | 47 +++++++++ io/Library_streams.mk | 34 ------ io/Library_textinstream.mk | 29 ----- io/Library_textoutstream.mk | 29 ----- io/Module_io.mk | 6 - io/source/TextInputStream/TextInputStream.cxx | 19 --- io/source/TextInputStream/textinstream.component | 25 ----- io/source/TextOutputStream/TextOutputStream.cxx | 19 --- io/source/TextOutputStream/textoutstream.component | 25 ----- io/source/acceptor/acceptor.component | 25 ----- io/source/acceptor/acceptor.cxx | 19 --- io/source/connector/connector.component | 25 ----- io/source/connector/connector.cxx | 18 --- io/source/io.component | 58 +++++++++++ io/source/services.cxx | 105 +++++++++++++++++++++ io/source/services.hxx | 94 ++++++++++++++++++ io/source/stm/factreg.cxx | 89 ----------------- io/source/stm/factreg.hxx | 57 ----------- io/source/stm/odata.cxx | 2 io/source/stm/omark.cxx | 2 io/source/stm/opipe.cxx | 2 io/source/stm/opump.cxx | 2 io/source/stm/streams.component | 46 --------- ure/Rdb_ure.mk | 7 - 27 files changed, 315 insertions(+), 537 deletions(-)
New commits: commit 3a009c427fc04c0a1a100f5f04516cedd1f6f118 Author: Marcos Paulo de Souza <[email protected]> Date: Mon Nov 4 13:06:32 2013 -0200 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 <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Stephan Bergmann <[email protected]> diff --git a/Repository.mk b/Repository.mk index 644fed5..c5bec39 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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, \ - acceptor \ binaryurp \ bootstrap \ - connector \ introspection \ invocadapt \ invocation \ + io \ $(if $(ENABLE_JAVA),javaloader) \ $(if $(ENABLE_JAVA),javavm) \ $(if $(ENABLE_JAVA),jvmaccess) \ @@ -485,10 +484,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ sal_textenc \ stocservices \ store \ - streams \ $(if $(ENABLE_JAVA),sunjavaplugin) \ - textinstream \ - textoutstream \ unoidl \ uuresolver \ xmlreader \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk deleted file mode 100644 index 5aa0099..0000000 --- a/io/Library_acceptor.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/io/Library_connector.mk b/io/Library_connector.mk deleted file mode 100644 index 665ddde..0000000 --- a/io/Library_connector.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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: diff --git a/io/Library_io.mk b/io/Library_io.mk new file mode 100644 index 0000000..cfe879f --- /dev/null +++ b/io/Library_io.mk @@ -0,0 +1,47 @@ +# -*- 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,io)) + +$(eval $(call gb_Library_use_external,io,boost_headers)) + +$(eval $(call gb_Library_use_udk_api,io)) + +$(eval $(call gb_Library_use_libraries,io,\ + cppu \ + cppuhelper \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_set_componentfile,io,io/source/io)) + +$(eval $(call gb_Library_set_include,io,\ + -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/omark \ + io/source/stm/opipe \ + io/source/stm/opump \ + io/source/stm/streamhelper \ + io/source/TextInputStream/TextInputStream \ + io/source/TextOutputStream/TextOutputStream \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/io/Library_streams.mk b/io/Library_streams.mk deleted file mode 100644 index fd05e17..0000000 --- a/io/Library_streams.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- 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,streams)) - -$(eval $(call gb_Library_use_external,streams,boost_headers)) - -$(eval $(call gb_Library_use_udk_api,streams)) - -$(eval $(call gb_Library_use_libraries,streams,\ - cppu \ - cppuhelper \ - sal \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams)) - -$(eval $(call gb_Library_add_exception_objects,streams,\ - io/source/stm/factreg \ - io/source/stm/odata \ - io/source/stm/omark \ - io/source/stm/opipe \ - io/source/stm/opump \ - io/source/stm/streamhelper \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk deleted file mode 100644 index d02f534..0000000 --- a/io/Library_textinstream.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- 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: diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk deleted file mode 100644 index 6a38a5a..0000000 --- a/io/Library_textoutstream.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- 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: diff --git a/io/Module_io.mk b/io/Module_io.mk index bb9dceb..29709982 100644 --- a/io/Module_io.mk +++ b/io/Module_io.mk @@ -10,11 +10,7 @@ $(eval $(call gb_Module_Module,io)) $(eval $(call gb_Module_add_targets,io,\ - Library_acceptor \ - Library_connector \ - Library_streams \ - Library_textinstream \ - Library_textoutstream \ + Library_io \ )) # vim:set noet sw=4 ts=4: diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index bf71231..07379af 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/io/XTextInputStream2.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include "services.hxx" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextInputStream" #define SERVICE_NAME "com.sun.star.io.TextInputStream" @@ -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: */ diff --git a/io/source/TextInputStream/textinstream.component b/io/source/TextInputStream/textinstream.component deleted file mode 100644 index 5d543a1..0000000 --- a/io/source/TextInputStream/textinstream.component +++ /dev/null @@ -1,25 +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="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> diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 84f9f48..e26d515 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/io/XTextOutputStream2.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include "services.hxx" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.TextOutputStream" #define SERVICE_NAME "com.sun.star.io.TextOutputStream" @@ -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: */ diff --git a/io/source/TextOutputStream/textoutstream.component b/io/source/TextOutputStream/textoutstream.component deleted file mode 100644 index 807489c..0000000 --- a/io/source/TextOutputStream/textoutstream.component +++ /dev/null @@ -1,25 +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="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> diff --git a/io/source/acceptor/acceptor.component b/io/source/acceptor/acceptor.component deleted file mode 100644 index 0b4877b..0000000 --- a/io/source/acceptor/acceptor.component +++ /dev/null @@ -1,25 +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="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> diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 61059e6..ddcb996 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/connection/XAcceptor.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include "services.hxx" #include "acceptor.hxx" #define IMPLEMENTATION_NAME "com.sun.star.comp.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: */ diff --git a/io/source/connector/connector.component b/io/source/connector/connector.component deleted file mode 100644 index 3e60b18..0000000 --- a/io/source/connector/connector.component +++ /dev/null @@ -1,25 +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="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> diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 966a2b6..b697483 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/connection/XConnector.hpp> +#include "services.hxx" #include "connector.hxx" #define IMPLEMENTATION_NAME "com.sun.star.comp.io.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: */ diff --git a/io/source/stm/streams.component b/io/source/io.component similarity index 77% rename from io/source/stm/streams.component rename to io/source/io.component index 7de1ebb..7905029 100644 --- a/io/source/stm/streams.component +++ b/io/source/io.component @@ -17,7 +17,7 @@ * 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";> <implementation name="com.sun.star.comp.io.Pump"> <service name="com.sun.star.io.Pump"/> @@ -43,4 +43,16 @@ <implementation name="com.sun.star.comp.io.stm.Pipe"> <service name="com.sun.star.io.Pipe"/> </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> diff --git a/io/source/services.cxx b/io/source/services.cxx new file mode 100644 index 0000000..778be6a --- /dev/null +++ b/io/source/services.cxx @@ -0,0 +1,105 @@ +/* -*- 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> + +#include "services.hxx" + +using namespace ::rtl; +using namespace ::cppu; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::registry; + +static const struct ImplementationEntry g_entries[] = +{ + { + io_acceptor::acceptor_CreateInstance, io_acceptor::acceptor_getImplementationName , + io_acceptor::acceptor_getSupportedServiceNames, createSingleComponentFactory , + 0, 0 + }, + { + stoc_connector::connector_CreateInstance, stoc_connector::connector_getImplementationName , + stoc_connector::connector_getSupportedServiceNames, createSingleComponentFactory , + 0, 0 + }, + { + io_stm::OPipeImpl_CreateInstance, io_stm::OPipeImpl_getImplementationName , + io_stm::OPipeImpl_getSupportedServiceNames, createSingleComponentFactory , + 0, 0 + }, + { + io_stm::OPumpImpl_CreateInstance, io_stm::OPumpImpl_getImplementationName , + io_stm::OPumpImpl_getSupportedServiceNames, createSingleComponentFactory , + 0, 0 + }, + { + io_stm::ODataInputStream_CreateInstance, io_stm::ODataInputStream_getImplementationName, + io_stm::ODataInputStream_getSupportedServiceNames, createSingleComponentFactory, + 0, 0 + }, + { + io_stm::ODataOutputStream_CreateInstance, io_stm::ODataOutputStream_getImplementationName, + io_stm::ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory, + 0, 0 + }, + { + io_stm::OObjectInputStream_CreateInstance, io_stm::OObjectInputStream_getImplementationName, + io_stm::OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory, + 0, 0 + }, + { + io_stm::OObjectOutputStream_CreateInstance, io_stm::OObjectOutputStream_getImplementationName, + io_stm::OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory, + 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 io_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/services.hxx b/io/source/services.hxx new file mode 100644 index 0000000..ec37e09 --- /dev/null +++ b/io/source/services.hxx @@ -0,0 +1,94 @@ +/* -*- 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: */ diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx deleted file mode 100644 index 6fb39e7..0000000 --- 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 c4548b2..0000000 --- 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 dcc4716..b3601b5 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 90ab999..44baddc 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 2fdf85d..b594967 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 6224f92..72f1570 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/ure/Rdb_ure.mk b/ure/Rdb_ure.mk index 7eeaf1a..e316514 100644 --- a/ure/Rdb_ure.mk +++ b/ure/Rdb_ure.mk @@ -10,10 +10,8 @@ $(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb)) $(eval $(call gb_Rdb_add_components,ure/services,\ - $(if $(filter IOS,$(OS)),, \ - io/source/acceptor/acceptor \ - io/source/connector/connector) \ binaryurp/source/binaryurp \ + io/source/io \ stoc/util/bootstrap \ stoc/source/inspect/introspection \ stoc/source/invocation_adapterfactory/invocadapt \ @@ -22,9 +20,6 @@ $(eval $(call gb_Rdb_add_components,ure/services,\ stoc/source/proxy_factory/proxyfac \ stoc/source/corereflection/reflection \ stoc/util/stocservices \ - io/source/stm/streams \ - io/source/TextInputStream/textinstream \ - io/source/TextOutputStream/textoutstream \ remotebridges/source/unourl_resolver/uuresolver \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
