diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-11-04 13:06:32 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-05 01:02:13 -0600 |
| commit | 3a009c427fc04c0a1a100f5f04516cedd1f6f118 (patch) | |
| tree | 9fc79e32d41ee9b1f47ae579a7773736dec8ee0e /io/source/acceptor | |
| parent | 5cf62a6ab450c25eb07a1ec08c857f17f674ef67 (diff) | |
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>
Diffstat (limited to 'io/source/acceptor')
| -rw-r--r-- | io/source/acceptor/acceptor.component | 25 | ||||
| -rw-r--r-- | io/source/acceptor/acceptor.cxx | 19 |
2 files changed, 1 insertions, 43 deletions
diff --git a/io/source/acceptor/acceptor.component b/io/source/acceptor/acceptor.component deleted file mode 100644 index 0b4877bc7b67..000000000000 --- 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 61059e6894f0..ddcb99664dec 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: */ |