diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-13 08:44:10 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-13 11:27:21 +0100 |
| commit | c388071c4d1bee70e41f9ff72d50e5966bb8f237 (patch) | |
| tree | 39adaffedb35fa7447f8c651d5948a366441eaf0 | |
| parent | fwk: Constructor feature for single-instance framework::Desktop. (diff) | |
| download | core-c388071c4d1bee70e41f9ff72d50e5966bb8f237.tar.gz core-c388071c4d1bee70e41f9ff72d50e5966bb8f237.zip | |
remove now empty fwk_component_getFactory
Change-Id: I5f2f5fc9ccc75b145572aa0bb88b00b0d7a5872d
| -rw-r--r-- | framework/Library_fwk.mk | 1 | ||||
| -rw-r--r-- | framework/source/register/registerservices.cxx | 40 | ||||
| -rw-r--r-- | framework/util/fwk.component | 2 | ||||
| -rwxr-xr-x | solenv/bin/native-code.py | 1 |
4 files changed, 1 insertions, 43 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index e8ad8af528b1..abfc7a91dda7 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -103,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/layoutmanager/uielement \ framework/source/loadenv/loadenv \ framework/source/loadenv/targethelper \ - framework/source/register/registerservices \ framework/source/services/ContextChangeEventMultiplexer \ framework/source/services/autorecovery \ framework/source/services/desktop \ diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx deleted file mode 100644 index a4a8741ccb22..000000000000 --- a/framework/source/register/registerservices.cxx +++ /dev/null @@ -1,40 +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 <macros/registration.hxx> - -/*================================================================================================================= - Add new include and new register info to for new services. - - Example: - - #include <service1.hxx> - #include <service2.hxx> - - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) - else - IFFACTORIE( Service2 ) - ) -=================================================================================================================*/ - -COMPONENTGETFACTORY ( fwk, - ) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/util/fwk.component b/framework/util/fwk.component index 1b8132c9deb7..6541f1406f3f 100644 --- a/framework/util/fwk.component +++ b/framework/util/fwk.component @@ -18,7 +18,7 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="fwk" xmlns="http://openoffice.org/2010/uno-components"> + xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.frame.SessionListener" constructor="com_sun_star_comp_frame_SessionListener_get_implementation"> <service name="com.sun.star.frame.SessionListener"/> diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 74546877f2bc..4106322abba3 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -24,7 +24,6 @@ core_factory_list = [ ("libconfigmgrlo.a", "configmgr_component_getFactory"), ("libfilterconfiglo.a", "filterconfig1_component_getFactory"), ("libfsstoragelo.a", "fsstorage_component_getFactory"), - ("libfwklo.a", "fwk_component_getFactory"), ("libhyphenlo.a", "hyphen_component_getFactory"), ("liblnglo.a", "lng_component_getFactory"), ("liblnthlo.a", "lnth_component_getFactory"), |