From e3adb51c54089a961cea1a33c5f54f6e552a4590 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 3 Jul 2020 16:28:42 +0200
Subject: [PATCH] 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>
---
 Repository.mk                                 |   2 -
 bin/update_pch                                |   1 -
 desktop/Pagein_common.mk                      |   1 -
 filter/CppunitTest_filter_msfilter.mk         |   1 -
 filter/CppunitTest_filter_priority.mk         |   1 -
 framework/Library_fwk.mk                      |  23 ++
 framework/Library_fwl.mk                      |  74 ------
 framework/Library_fwm.mk                      |  59 -----
 framework/Module_framework.mk                 |   2 -
 framework/inc/pch/precompiled_fwl.cxx         |  12 -
 framework/inc/pch/precompiled_fwl.hxx         | 211 ------------------
 .../source/register/register3rdcomponents.cxx |  45 ----
 framework/source/register/registertemp.cxx    |  10 +-
 framework/util/fwk.component                  |  68 +++++-
 framework/util/fwl.component                  |  79 -------
 framework/util/fwm.component                  |  31 ---
 postprocess/Rdb_services.mk                   |   2 -
 sd/Library_sdui.mk                            |   1 -
 .../gbuild/extensions/pre_MergedLibsList.mk   |   1 -
 19 files changed, 98 insertions(+), 526 deletions(-)
 delete mode 100644 framework/Library_fwl.mk
 delete mode 100644 framework/Library_fwm.mk
 delete mode 100644 framework/inc/pch/precompiled_fwl.cxx
 delete mode 100644 framework/inc/pch/precompiled_fwl.hxx
 delete mode 100644 framework/source/register/register3rdcomponents.cxx
 delete mode 100644 framework/util/fwl.component
 delete mode 100644 framework/util/fwm.component

diff --git a/Repository.mk b/Repository.mk
index 4f5f77921888..5d3be2f78188 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -365,8 +365,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	frm \
 	fsstorage \
 	fwk \
-	fwl \
-	fwm \
 	$(if $(filter WNT,$(OS)),gdipluscanvas) \
 	guesslang \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
diff --git a/bin/update_pch b/bin/update_pch
index 0dd9d62d34da..e5939e7a441c 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -77,7 +77,6 @@ DEFAULTS = \
     'editeng.editeng'                   : ( 5, EXCLUDE, INCLUDE, EXCLUDE), #  13.0
     'forms.frm'                         : ( 2, EXCLUDE, EXCLUDE, EXCLUDE), #  14.2
     'framework.fwk'                     : ( 7, EXCLUDE, INCLUDE, INCLUDE), #  14.8
-    'framework.fwl'                     : ( 5, EXCLUDE, INCLUDE, INCLUDE), #   5.1
     'hwpfilter.hwp'                     : ( 3, EXCLUDE, INCLUDE, INCLUDE), #   6.0
     'lotuswordpro.lwpft'                : ( 2, EXCLUDE, EXCLUDE, EXCLUDE), #  11.6
     'oox.oox'                           : ( 6, EXCLUDE, EXCLUDE, INCLUDE), #  28.2
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index cd96e9a25b25..d0a0e689c2d2 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
     lng \
     xo \
     fwk \
-    fwl \
     package2 \
     ucpfile1 \
     ucb1 \
diff --git a/filter/CppunitTest_filter_msfilter.mk b/filter/CppunitTest_filter_msfilter.mk
index ad4596d4edb0..cf4347342f62 100644
--- a/filter/CppunitTest_filter_msfilter.mk
+++ b/filter/CppunitTest_filter_msfilter.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_msfilter,\
 	configmgr/source/configmgr \
 	filter/source/config/cache/filterconfig1 \
 	framework/util/fwk \
-	framework/util/fwl \
 	i18npool/util/i18npool \
 	ucb/source/core/ucb1 \
 	ucb/source/ucp/file/ucpfile1 \
diff --git a/filter/CppunitTest_filter_priority.mk b/filter/CppunitTest_filter_priority.mk
index 5f9042dd0859..d942f5d019f5 100644
--- a/filter/CppunitTest_filter_priority.mk
+++ b/filter/CppunitTest_filter_priority.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_priority,\
 	configmgr/source/configmgr \
 	filter/source/config/cache/filterconfig1 \
 	framework/util/fwk \
-	framework/util/fwl \
 	i18npool/util/i18npool \
 	ucb/source/core/ucb1 \
 	ucb/source/ucp/file/ucpfile1 \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 4adab569be94..61bb9d825906 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
 $(eval $(call gb_Library_set_include,fwk,\
     -I$(SRCDIR)/framework/source/inc \
     -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/CustomTarget/officecfg/registry \
     $$(INCLUDE) \
 ))
 
@@ -78,6 +79,12 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/dispatch/loaddispatcher \
     framework/source/dispatch/startmoduledispatcher \
     framework/source/dispatch/windowcommanddispatch \
+    framework/source/dispatch/dispatchdisabler \
+    framework/source/dispatch/mailtodispatcher \
+    framework/source/dispatch/oxt_handler \
+    framework/source/dispatch/popupmenudispatcher \
+    framework/source/dispatch/servicehandler \
+    framework/source/dispatch/systemexec \
     framework/source/helper/dockingareadefaultacceptor \
     framework/source/helper/ocomponentaccess \
     framework/source/helper/ocomponentenumeration \
@@ -92,6 +99,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/helper/vclstatusindicator \
     framework/source/helper/wakeupthread \
     framework/source/interaction/quietinteraction \
+    framework/source/jobs/helponstartup \
+    framework/source/jobs/shelljob \
     framework/source/fwe/classes/actiontriggercontainer \
     framework/source/fwe/classes/actiontriggerpropertyset \
     framework/source/fwe/classes/actiontriggerseparatorpropertyset \
@@ -139,6 +148,9 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/layoutmanager/uielement \
     framework/source/loadenv/loadenv \
     framework/source/loadenv/targethelper \
+    framework/source/recording/dispatchrecorder \
+    framework/source/recording/dispatchrecordersupplier \
+    framework/source/register/registertemp \
     framework/source/services/ContextChangeEventMultiplexer \
     framework/source/services/autorecovery \
     framework/source/services/desktop \
@@ -150,6 +162,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/services/substitutepathvars \
     framework/source/services/taskcreatorsrv \
     framework/source/services/urltransformer \
+    framework/source/services/mediatypedetectionhelper \
+    framework/source/services/uriabbreviation \
     framework/source/uiconfiguration/CommandImageResolver \
     framework/source/uiconfiguration/ImageList \
     framework/source/uiconfiguration/globalsettings \
@@ -199,6 +213,15 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/uielement/toolbarmerger \
     framework/source/uielement/toolbarwrapper \
     framework/source/uielement/uicommanddescription \
+    framework/source/uielement/fontmenucontroller \
+    framework/source/uielement/fontsizemenucontroller \
+    framework/source/uielement/footermenucontroller \
+    framework/source/uielement/headermenucontroller \
+    framework/source/uielement/langselectionmenucontroller \
+    framework/source/uielement/macrosmenucontroller \
+    framework/source/uielement/newmenucontroller \
+    framework/source/uielement/toolbarmodemenucontroller \
+    framework/source/uielement/toolbarsmenucontroller \
     framework/source/uifactory/addonstoolbarfactory \
     framework/source/uifactory/factoryconfiguration \
     framework/source/uifactory/menubarfactory \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
deleted file mode 100644
index 1917c57b6551..000000000000
--- a/framework/Library_fwl.mk
+++ /dev/null
@@ -1,74 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,fwl))
-
-$(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
-
-$(eval $(call gb_Library_set_include,fwl,\
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(WORKDIR)/CustomTarget/officecfg/registry \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_external,fwl,boost_headers))
-
-$(eval $(call gb_Library_set_precompiled_header,fwl,framework/inc/pch/precompiled_fwl))
-
-$(eval $(call gb_Library_use_sdk_api,fwl))
-
-$(eval $(call gb_Library_use_libraries,fwl,\
-    comphelper \
-    cppu \
-    cppuhelper \
-    fwk \
-    i18nlangtag \
-    sal \
-    svl \
-    svt \
-    tk \
-    tl \
-    utl \
-    vcl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,fwl,\
-    framework/source/dispatch/mailtodispatcher \
-    framework/source/dispatch/oxt_handler \
-    framework/source/dispatch/popupmenudispatcher \
-    framework/source/dispatch/servicehandler \
-    framework/source/recording/dispatchrecorder \
-    framework/source/recording/dispatchrecordersupplier \
-    framework/source/register/registertemp \
-    framework/source/dispatch/dispatchdisabler \
-    framework/source/services/mediatypedetectionhelper \
-    framework/source/services/uriabbreviation \
-    framework/source/uielement/fontmenucontroller \
-    framework/source/uielement/fontsizemenucontroller \
-    framework/source/uielement/footermenucontroller \
-    framework/source/uielement/headermenucontroller \
-    framework/source/uielement/langselectionmenucontroller \
-    framework/source/uielement/macrosmenucontroller \
-    framework/source/uielement/newmenucontroller \
-    framework/source/uielement/toolbarmodemenucontroller \
-    framework/source/uielement/toolbarsmenucontroller \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
deleted file mode 100644
index 061a6d362ba7..000000000000
--- a/framework/Library_fwm.mk
+++ /dev/null
@@ -1,59 +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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,fwm))
-
-$(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
-
-$(eval $(call gb_Library_use_custom_headers,fwm,\
-	officecfg/registry \
-))
-
-$(eval $(call gb_Library_set_include,fwm,\
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/source/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_external,fwm,boost_headers))
-
-$(eval $(call gb_Library_use_sdk_api,fwm))
-
-$(eval $(call gb_Library_use_libraries,fwm,\
-    comphelper \
-    cppu \
-    cppuhelper \
-    fwk \
-    sal \
-    svl \
-    svt \
-    tk \
-    tl \
-    utl \
-    vcl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,fwm,\
-    framework/source/dispatch/systemexec \
-    framework/source/jobs/helponstartup \
-    framework/source/jobs/shelljob \
-    framework/source/register/register3rdcomponents \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 7fb48a527b9a..4baf948abd9d 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_Module_Module,framework))
 
 $(eval $(call gb_Module_add_targets,framework,\
     Library_fwk \
-    Library_fwl \
-    Library_fwm \
     Package_dtd \
     UIConfig_startmodule \
 ))
diff --git a/framework/inc/pch/precompiled_fwl.cxx b/framework/inc/pch/precompiled_fwl.cxx
deleted file mode 100644
index 28c5149d5d6c..000000000000
--- a/framework/inc/pch/precompiled_fwl.cxx
+++ /dev/null
@@ -1,12 +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/.
- */
-
-#include "precompiled_fwl.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
deleted file mode 100644
index 6031e80fb914..000000000000
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ /dev/null
@@ -1,211 +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 has been autogenerated by update_pch.sh. It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed). All such
- manual changes will be rewritten by the next run of update_pch.sh (which presumably
- also fixes all possible problems, so it's usually better to use it).
-
- Generated on 2020-04-25 20:55:03 using:
- ./bin/update_pch framework fwl --cutoff=5 --exclude:system --include:module --include:local
-
- If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwl.hxx "make framework.build" --find-conflicts
-*/
-
-#if PCH_LEVEL >= 1
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <float.h>
-#include <functional>
-#include <initializer_list>
-#include <iomanip>
-#include <limits.h>
-#include <limits>
-#include <math.h>
-#include <memory>
-#include <new>
-#include <optional>
-#include <ostream>
-#include <stddef.h>
-#include <string.h>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-#include <boost/property_tree/ptree_fwd.hpp>
-#endif // PCH_LEVEL >= 1
-#if PCH_LEVEL >= 2
-#include <osl/conditn.hxx>
-#include <osl/diagnose.h>
-#include <osl/doublecheckedlocking.h>
-#include <osl/endian.h>
-#include <osl/getglobalmutex.hxx>
-#include <osl/interlck.h>
-#include <osl/mutex.hxx>
-#include <osl/time.h>
-#include <rtl/alloc.h>
-#include <rtl/character.hxx>
-#include <rtl/instance.hxx>
-#include <rtl/locale.h>
-#include <rtl/math.h>
-#include <rtl/ref.hxx>
-#include <rtl/string.h>
-#include <rtl/string.hxx>
-#include <rtl/stringconcat.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-#include <rtl/unload.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
-#include <sal/config.h>
-#include <sal/detail/log.h>
-#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
-#include <sal/typesizes.h>
-#include <vcl/Scanline.hxx>
-#include <vcl/alpha.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/cairo.hxx>
-#include <vcl/checksum.hxx>
-#include <vcl/devicecoordinate.hxx>
-#include <vcl/dllapi.h>
-#include <vcl/fntstyle.hxx>
-#include <vcl/font.hxx>
-#include <vcl/keycodes.hxx>
-#include <vcl/mapmod.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/metaactiontypes.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/outdevmap.hxx>
-#include <vcl/outdevstate.hxx>
-#include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
-#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/vclreferencebase.hxx>
-#include <vcl/wall.hxx>
-#endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
-#include <basegfx/basegfxdllapi.h>
-#include <basegfx/color/bcolor.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/point/b2ipoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/basicrange.hxx>
-#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/tuple/b2ituple.hxx>
-#include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/utils/common.hxx>
-#include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/vector/b2enums.hxx>
-#include <basegfx/vector/b2ivector.hxx>
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.h>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XWeak.hpp>
-#include <com/sun/star/uno/genfunc.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/comphelperdllapi.h>
-#include <comphelper/processfactory.hxx>
-#include <cppu/cppudllapi.h>
-#include <cppu/unotype.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/implbase_ex_post.hxx>
-#include <cppuhelper/implbase_ex_pre.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <i18nlangtag/i18nlangtagdllapi.h>
-#include <i18nlangtag/lang.h>
-#include <macros/xserviceinfo.hxx>
-#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/strong_int.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <o3tl/underlyingenumvalue.hxx>
-#include <svl/svldllapi.h>
-#include <svtools/popupmenucontrollerbase.hxx>
-#include <svtools/svtdllapi.h>
-#include <toolkit/awt/vclxmenu.hxx>
-#include <tools/color.hxx>
-#include <tools/fontenum.hxx>
-#include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <tools/mapunit.hxx>
-#include <tools/poly.hxx>
-#include <tools/ref.hxx>
-#include <tools/solar.h>
-#include <tools/toolsdllapi.h>
-#include <typelib/typeclass.h>
-#include <typelib/typedescription.h>
-#include <typelib/uik.h>
-#include <uno/any2.h>
-#include <uno/data.h>
-#include <uno/sequence2.h>
-#include <unotools/fontdefs.hxx>
-#include <unotools/options.hxx>
-#include <unotools/unotoolsdllapi.h>
-#endif // PCH_LEVEL >= 3
-#if PCH_LEVEL >= 4
-#include <framework/fwkdllapi.h>
-#include <services.h>
-#endif // PCH_LEVEL >= 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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: */
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index bf321d0c0c12..5ea3ee56d500 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@"
-    xmlns="http://openoffice.org/2010/uno-components">
+    prefix="fwk" 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"/>
@@ -212,4 +212,70 @@
       constructor="com_sun_star_comp_framework_ResourceMenuController_get_implementation">
     <service name="com.sun.star.frame.PopupMenuController"/>
   </implementation>
+  <implementation name="com.sun.star.comp.framework.LanguageSelectionMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorder">
+    <service name="com.sun.star.frame.DispatchRecorder"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorderSupplier">
+    <service name="com.sun.star.frame.DispatchRecorderSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontSizeMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FooterMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.HeaderMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MacrosMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MailToDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MediaTypeDetectionHelper">
+    <service name="com.sun.star.frame.MediaTypeDetectionHelper"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.NewMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.OXTFileHandler">
+    <service name="com.sun.star.frame.ContentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ServiceHandler">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolbarModeMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UriAbbreviation">
+    <service name="com.sun.star.util.UriAbbreviation"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.services.DispatchHelper">
+    <service name="com.sun.star.frame.DispatchHelper"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.services.DispatchDisabler">
+    <service name="com.sun.star.frame.DispatchDisabler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.HelpOnStartup">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ShellJob">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.SystemExecute">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
 </component>
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
deleted file mode 100644
index 75e10b9c1b6f..000000000000
--- a/framework/util/fwl.component
+++ /dev/null
@@ -1,79 +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" environment="@CPPU_ENV@"
-    prefix="fwl" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.framework.LanguageSelectionMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.DispatchRecorder">
-    <service name="com.sun.star.frame.DispatchRecorder"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.DispatchRecorderSupplier">
-    <service name="com.sun.star.frame.DispatchRecorderSupplier"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.FontMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.FontSizeMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.FooterMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.HeaderMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.MacrosMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.MailToDispatcher">
-    <service name="com.sun.star.frame.ProtocolHandler"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.MediaTypeDetectionHelper">
-    <service name="com.sun.star.frame.MediaTypeDetectionHelper"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.NewMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.OXTFileHandler">
-    <service name="com.sun.star.frame.ContentHandler"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher">
-    <service name="com.sun.star.frame.ProtocolHandler"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.ServiceHandler">
-    <service name="com.sun.star.frame.ProtocolHandler"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.ToolbarModeMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
-    <service name="com.sun.star.frame.PopupMenuController"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.UriAbbreviation">
-    <service name="com.sun.star.util.UriAbbreviation"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.services.DispatchHelper">
-    <service name="com.sun.star.frame.DispatchHelper"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.services.DispatchDisabler">
-    <service name="com.sun.star.frame.DispatchDisabler"/>
-  </implementation>
-</component>
diff --git a/framework/util/fwm.component b/framework/util/fwm.component
deleted file mode 100644
index 4724e64697bf..000000000000
--- a/framework/util/fwm.component
+++ /dev/null
@@ -1,31 +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" environment="@CPPU_ENV@"
-    prefix="fwm" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.framework.HelpOnStartup">
-    <service name="com.sun.star.task.Job"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.ShellJob">
-    <service name="com.sun.star.task.Job"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.framework.SystemExecute">
-    <service name="com.sun.star.frame.ProtocolHandler"/>
-  </implementation>
-</component>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index b521dfb346fe..71f9421f6a90 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -42,8 +42,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	formula/util/for \
 	$(call gb_Helper_optional,DESKTOP,fpicker/source/office/fps_office) \
 	framework/util/fwk \
-	framework/util/fwl \
-	framework/util/fwm \
 	hwpfilter/source/hwp \
 	i18npool/source/search/i18nsearch \
 	i18npool/util/i18npool \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index abd25d24e15d..c776e2eed532 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\
     cppuhelper \
     editeng \
     i18nlangtag \
-    fwl \
     fwk \
     sal \
     salhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b56ce6b0b075..a1b1e6134f9b 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -41,7 +41,6 @@ MERGE_LIBRARY_LIST := \
 	frm \
 	fsstorage \
 	fwk \
-	fwl \
 	$(if $(filter WNT,$(OS)),gdipluscanvas) \
 	guesslang \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \