diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-03 16:28:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-04 22:42:54 +0200 |
| commit | e3adb51c54089a961cea1a33c5f54f6e552a4590 (patch) | |
| tree | f24e0be144f6a71cf1e598583b713469fce4243e /framework/source | |
| parent | 50889effe57d9e28ecd9403ea0d695ecd73ac791 (diff) | |
reduce number of framework libraries
Change-Id: I18bfdba3d26593f796d8b0bda87720e31066d5e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97968
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/register/register3rdcomponents.cxx | 45 | ||||
| -rw-r--r-- | framework/source/register/registertemp.cxx | 10 |
2 files changed, 8 insertions, 47 deletions
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx deleted file mode 100644 index 4878a30e393c..000000000000 --- a/framework/source/register/register3rdcomponents.cxx +++ /dev/null @@ -1,45 +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 ) - ) -=================================================================================================================*/ -#include <jobs/helponstartup.hxx> -#include <dispatch/systemexec.hxx> -#include <jobs/shelljob.hxx> - -COMPONENTGETFACTORY ( fwm, - IFFACTORY( ::framework::HelpOnStartup ) else - IFFACTORY( ::framework::SystemExec ) else - IFFACTORY( ::framework::ShellJob ) - ) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 35add0a5ef31..5e0e767818b7 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -51,8 +51,11 @@ #include <uielement/newmenucontroller.hxx> #include <uielement/toolbarmodemenucontroller.hxx> #include <uielement/toolbarsmenucontroller.hxx> +#include <jobs/helponstartup.hxx> +#include <dispatch/systemexec.hxx> +#include <jobs/shelljob.hxx> -COMPONENTGETFACTORY ( fwl, +COMPONENTGETFACTORY ( fwk, IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else @@ -71,7 +74,10 @@ COMPONENTGETFACTORY ( fwl, IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::HeaderMenuController ) else IFFACTORY( ::framework::LanguageSelectionMenuController ) else - IFFACTORY( ::framework::Oxt_Handler ) + IFFACTORY( ::framework::Oxt_Handler ) else + IFFACTORY( ::framework::HelpOnStartup ) else + IFFACTORY( ::framework::SystemExec ) else + IFFACTORY( ::framework::ShellJob ) ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |