Makefile.in | 2
Repository.mk | 2
basctl/Library_basctl.mk | 2
bin/find-mergedlib-can-be-private.py | 2
bin/update_pch | 2
chart2/Library_chartcore.mk | 2
dbaccess/Library_dba.mk | 2
dbaccess/Library_dbu.mk | 2
desktop/Pagein_common.mk | 2
filter/Library_filterconfig.mk | 2
framework/Library_fwe.mk | 82 ------
framework/Library_fwi.mk | 72 ------
framework/Library_fwk.mk | 46 +++
framework/Library_fwl.mk | 3
framework/Library_fwm.mk | 2
framework/Module_framework.mk | 2
framework/inc/addonmenu.hxx | 4
framework/inc/classes/actiontriggercontainer.hxx | 2
framework/inc/classes/actiontriggerpropertyset.hxx | 2
framework/inc/classes/converter.hxx | 4
framework/inc/classes/fwkresid.hxx | 4
framework/inc/classes/imagewrapper.hxx | 2
framework/inc/classes/protocolhandlercache.hxx | 6
framework/inc/classes/rootactiontriggercontainer.hxx | 2
framework/inc/helper/mischelper.hxx | 8
framework/inc/helper/propertysetcontainer.hxx | 2
framework/inc/helper/shareablemutex.hxx | 2
framework/inc/jobs/configaccess.hxx | 4
framework/inc/jobs/jobconst.hxx | 4
framework/inc/menuconfiguration.hxx | 6
framework/inc/pch/precompiled_fwe.cxx | 12 -
framework/inc/pch/precompiled_fwe.hxx | 168 --------------
framework/inc/pch/precompiled_fwi.cxx | 12 -
framework/inc/pch/precompiled_fwi.hxx | 89 -------
framework/inc/pch/precompiled_fwk.hxx | 4
framework/inc/pch/precompiled_fwl.hxx | 2
framework/inc/statusbarconfiguration.hxx | 4
framework/inc/toolboxconfiguration.hxx | 4
framework/inc/uielement/constitemcontainer.hxx | 4
framework/inc/uielement/itemcontainer.hxx | 2
framework/inc/uielement/rootitemcontainer.hxx | 10
framework/inc/xml/menudocumenthandler.hxx | 2
framework/inc/xml/saxnamespacefilter.hxx | 4
framework/inc/xml/statusbardocumenthandler.hxx | 2
framework/inc/xml/toolboxdocumenthandler.hxx | 2
framework/inc/xml/xmlnamespaces.hxx | 2
framework/source/fwe/helper/actiontriggerhelper.cxx | 4
include/framework/ContextChangeEventMultiplexerTunnel.hxx | 4
include/framework/actiontriggerhelper.hxx | 4
include/framework/addonsoptions.hxx | 12 -
include/framework/configimporter.hxx | 4
include/framework/desktop.hxx | 4
include/framework/dispatchhelper.hxx | 4
include/framework/documentundoguard.hxx | 4
include/framework/framelistanalyzer.hxx | 4
include/framework/fwedllapi.h | 34 --
include/framework/fwidllapi.h | 30 --
include/framework/fwkdllapi.h | 6
include/framework/interaction.hxx | 10
include/framework/sfxhelperfunctions.hxx | 22 -
include/framework/titlehelper.hxx | 4
include/framework/transactionmanager.hxx | 4
include/framework/undomanagerhelper.hxx | 4
reportdesign/Library_rpt.mk | 2
reportdesign/Library_rptui.mk | 2
scripting/Library_protocolhandler.mk | 2
sd/Library_sdui.mk | 2
sfx2/Library_sfx.mk | 2
sfx2/inc/pch/precompiled_sfx.hxx | 2
solenv/clang-format/blacklist | 2
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2
svx/Library_svx.mk | 2
svx/Library_svxcore.mk | 2
vcl/commonfuzzer.mk | 2
74 files changed, 155 insertions(+), 627 deletions(-)
New commits:
commit d70da0b9e24991f8d58e83f53dbbf5b58c721f43
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 3 13:39:36 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jul 4 16:56:59 2020 +0200
reduce number of framework libraries
Change-Id: If2bf85301eb1523a636d031f6e5a9f78cb1ee06b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97871
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/Makefile.in b/Makefile.in
index fe64e37dee7f..d0d19f9e0545 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -480,7 +480,7 @@ $(foreach ide,\
eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
-fuzzers: StaticLibrary_dtoa Library_sal Library_salhelper Library_reg
Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag
Library_cppuhelper Library_comphelper StaticLibrary_ulingu
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax
Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie
Library_icg Library_reflection Library_invocadapt Library_bootstrap
Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno
instsetoo_native more_fonts StaticLibrary_boost_locale
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math
Library_forui Library_binaryurp Library_io Library_invocation
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Library_w
pftwriter Executable_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer
Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer
Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer
Executable_xlsxfuzzer Executable_pptxfuzzer Executable_htmlfuzzer
Executable_rtffuzzer Executable_mmlfuzzer Executable_mtpfuzzer
Executable_olefuzzer Executable_lwpfuzzer Executable_hwpfuzzer
Executable_wmffuzzer Executable_dxffuzzer Executable_sftfuzzer
Executable_svmfuzzer Executable_tiffuzzer Executable_epsfuzzer
Executable_jpgfuzzer Executable_metfuzzer Executable_bmpfuzzer
Executable_giffuzzer Executable_pngfuzzer Executable_602fuzzer
Executable_tgafuzzer Executable_pcxfuzzer Executable_psdfuzzer
Executable_ppmfuzzer Executable_pcdfuzzer Executable_rasfuzzer
Executable_pctfuzzer Executable_xpmfuzzer Executable_xbmfuzzer
+fuzzers: StaticLibrary_dtoa Library_sal Library_salhelper Library_reg
Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag
Library_cppuhelper Library_comphelper StaticLibrary_ulingu
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp
Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg
Library_reflection Library_invocadapt Library_bootstrap Library_introspection
Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native
more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs
StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw
StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui
Library_binaryurp Library_io Library_invocation Library_namingservice
Library_proxyfac Library_uuresolver Module_ure Library_wpftwriter Executable_ppt
fuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer
Executable_pptxfuzzer Executable_htmlfuzzer Executable_rtffuzzer
Executable_mmlfuzzer Executable_mtpfuzzer Executable_olefuzzer
Executable_lwpfuzzer Executable_hwpfuzzer Executable_wmffuzzer
Executable_dxffuzzer Executable_sftfuzzer Executable_svmfuzzer
Executable_tiffuzzer Executable_epsfuzzer Executable_jpgfuzzer
Executable_metfuzzer Executable_bmpfuzzer Executable_giffuzzer
Executable_pngfuzzer Executable_602fuzzer Executable_tgafuzzer
Executable_pcxfuzzer Executable_psdfuzzer Executable_ppmfuzzer
Executable_pcdfuzzer Executable_rasfuzzer Executable_pctfuzzer
Executable_xpmfuzzer Executable_xbmfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index fc701d8bff87..4f5f77921888 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -364,8 +364,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
forui \
frm \
fsstorage \
- fwe \
- fwi \
fwk \
fwl \
fwm \
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 0a6e2fb3f3ac..c28907a0cd56 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_use_libraries,basctl,\
cppu \
cppuhelper \
editeng \
- fwe \
+ fwk \
sal \
i18nlangtag \
sb \
diff --git a/bin/find-mergedlib-can-be-private.py
b/bin/find-mergedlib-can-be-private.py
index ac9d96712391..314802d9079a 100755
--- a/bin/find-mergedlib-can-be-private.py
+++ b/bin/find-mergedlib-can-be-private.py
@@ -37,8 +37,6 @@ merged_libs = { \
,"expwrap" \
,"filterconfig" \
,"fsstorage" \
- ,"fwe" \
- ,"fwi" \
,"fwk" \
,"helplinker)" \
,"i18npool" \
diff --git a/bin/update_pch b/bin/update_pch
index 00cd50681daa..0dd9d62d34da 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -76,8 +76,6 @@ DEFAULTS = \
'drawinglayer.drawinglayer' : ( 4, EXCLUDE, EXCLUDE, EXCLUDE), #
7.4
'editeng.editeng' : ( 5, EXCLUDE, INCLUDE, EXCLUDE), #
13.0
'forms.frm' : ( 2, EXCLUDE, EXCLUDE, EXCLUDE), #
14.2
- 'framework.fwe' : (10, EXCLUDE, INCLUDE, EXCLUDE), #
5.5
- 'framework.fwi' : ( 9, EXCLUDE, INCLUDE, EXCLUDE), #
3.4
'framework.fwk' : ( 7, EXCLUDE, INCLUDE, INCLUDE), #
14.8
'framework.fwl' : ( 5, EXCLUDE, INCLUDE, INCLUDE), #
5.1
'hwpfilter.hwp' : ( 3, EXCLUDE, INCLUDE, INCLUDE), #
6.0
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 063e77d42305..1e285392c42f 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
cppuhelper \
drawinglayer \
editeng \
- fwe \
+ fwk \
i18nlangtag \
sal \
salhelper \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 0b3d18e37a99..ecef24d3b4c2 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,dba,\
cppuhelper \
dbahsql \
dbtools \
- fwe \
+ fwk \
i18nlangtag \
sal \
salhelper \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index f56531b485f6..56e839029642 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
dba \
dbtools \
editeng \
- fwe \
+ fwk \
sal \
salhelper \
i18nlangtag \
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index c1661a39b641..cd96e9a25b25 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -19,9 +19,7 @@ $(eval $(call gb_Pagein_add_objects,common,\
) \
lng \
xo \
- fwe \
fwk \
- fwi \
fwl \
package2 \
ucpfile1 \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 84321667f05f..e9cd6bfabd5a 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,filterconfig,\
))
$(eval $(call gb_Library_use_libraries,filterconfig,\
- fwe \
+ fwk \
utl \
tl \
comphelper \
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
deleted file mode 100644
index 8b56a463564d..000000000000
--- a/framework/Library_fwe.mk
+++ /dev/null
@@ -1,82 +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,fwe))
-
-$(eval $(call gb_Library_set_include,fwe,\
- -I$(SRCDIR)/framework/source/inc \
- -I$(SRCDIR)/framework/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_defs,fwe,\
- -DFWE_DLLIMPLEMENTATION\
-))
-
-$(eval $(call gb_Library_use_sdk_api,fwe))
-
-$(eval $(call gb_Library_use_external,fwe,boost_headers))
-
-$(eval $(call
gb_Library_set_precompiled_header,fwe,framework/inc/pch/precompiled_fwe))
-
-$(eval $(call gb_Library_use_libraries,fwe,\
- comphelper \
- cppu \
- cppuhelper \
- fwi \
- sal \
- salhelper \
- i18nlangtag \
- svl \
- svt \
- tl \
- utl \
- vcl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,fwe,\
- framework/source/fwe/classes/actiontriggercontainer \
- framework/source/fwe/classes/actiontriggerpropertyset \
- framework/source/fwe/classes/actiontriggerseparatorpropertyset \
- framework/source/fwe/classes/addonmenu \
- framework/source/fwe/classes/addonsoptions \
- framework/source/fwe/classes/framelistanalyzer \
- framework/source/fwe/classes/fwkresid \
- framework/source/fwe/classes/imagewrapper \
- framework/source/fwe/classes/rootactiontriggercontainer \
- framework/source/fwe/classes/sfxhelperfunctions \
- framework/source/fwe/dispatch/interaction \
- framework/source/fwe/helper/actiontriggerhelper \
- framework/source/fwe/helper/configimporter \
- framework/source/fwe/helper/propertysetcontainer \
- framework/source/fwe/helper/titlehelper \
- framework/source/fwe/helper/documentundoguard \
- framework/source/fwe/helper/undomanagerhelper \
- framework/source/fwe/xml/menuconfiguration \
- framework/source/fwe/xml/menudocumenthandler \
- framework/source/fwe/xml/saxnamespacefilter \
- framework/source/fwe/xml/statusbarconfiguration \
- framework/source/fwe/xml/statusbardocumenthandler \
- framework/source/fwe/xml/toolboxconfiguration \
- framework/source/fwe/xml/toolboxdocumenthandler \
- framework/source/fwe/xml/xmlnamespaces \
- framework/source/services/dispatchhelper \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
deleted file mode 100644
index 536a6e5226c4..000000000000
--- a/framework/Library_fwi.mk
+++ /dev/null
@@ -1,72 +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,fwi))
-
-$(eval $(call gb_Library_add_defs,fwi,\
- -DFWI_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,fwi))
-
-$(eval $(call gb_Library_set_include,fwi,\
- -I$(SRCDIR)/framework/source/inc \
- -I$(SRCDIR)/framework/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_external,fwi,boost_headers))
-
-$(eval $(call
gb_Library_set_precompiled_header,fwi,framework/inc/pch/precompiled_fwi))
-
-$(eval $(call gb_Library_use_libraries,fwi,\
- comphelper \
- cppu \
- cppuhelper \
- i18nlangtag \
- sal \
- salhelper \
- svl \
- svt \
- tk \
- tl \
- utl \
- vcl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,fwi,\
- framework/source/fwi/classes/converter \
- framework/source/fwi/classes/protocolhandlercache \
- framework/source/fwi/helper/mischelper \
- framework/source/fwi/helper/shareablemutex \
- framework/source/fwi/jobs/configaccess \
- framework/source/fwi/jobs/jobconst \
- framework/source/fwi/threadhelp/transactionmanager \
- framework/source/fwi/uielement/constitemcontainer \
- framework/source/fwi/uielement/itemcontainer \
- framework/source/fwi/uielement/rootitemcontainer \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_system_win32_libs,fwi,\
- advapi32 \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 718045b47318..4adab569be94 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -20,7 +20,7 @@
$(eval $(call gb_Library_Library,fwk))
$(eval $(call gb_Library_add_defs,fwk,\
- -DLO_DLLIMPLEMENTATION_FWK \
+ -DFWK_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,fwk,\
cppuhelper \
$(call gb_Helper_optional,BREAKPAD, \
crashreport) \
- fwe \
- fwi \
i18nlangtag \
sal \
salhelper \
@@ -94,6 +92,41 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/helper/vclstatusindicator \
framework/source/helper/wakeupthread \
framework/source/interaction/quietinteraction \
+ framework/source/fwe/classes/actiontriggercontainer \
+ framework/source/fwe/classes/actiontriggerpropertyset \
+ framework/source/fwe/classes/actiontriggerseparatorpropertyset \
+ framework/source/fwe/classes/addonmenu \
+ framework/source/fwe/classes/addonsoptions \
+ framework/source/fwe/classes/framelistanalyzer \
+ framework/source/fwe/classes/fwkresid \
+ framework/source/fwe/classes/imagewrapper \
+ framework/source/fwe/classes/rootactiontriggercontainer \
+ framework/source/fwe/classes/sfxhelperfunctions \
+ framework/source/fwe/dispatch/interaction \
+ framework/source/fwe/helper/actiontriggerhelper \
+ framework/source/fwe/helper/configimporter \
+ framework/source/fwe/helper/propertysetcontainer \
+ framework/source/fwe/helper/titlehelper \
+ framework/source/fwe/helper/documentundoguard \
+ framework/source/fwe/helper/undomanagerhelper \
+ framework/source/fwe/xml/menuconfiguration \
+ framework/source/fwe/xml/menudocumenthandler \
+ framework/source/fwe/xml/saxnamespacefilter \
+ framework/source/fwe/xml/statusbarconfiguration \
+ framework/source/fwe/xml/statusbardocumenthandler \
+ framework/source/fwe/xml/toolboxconfiguration \
+ framework/source/fwe/xml/toolboxdocumenthandler \
+ framework/source/fwe/xml/xmlnamespaces \
+ framework/source/fwi/classes/converter \
+ framework/source/fwi/classes/protocolhandlercache \
+ framework/source/fwi/helper/mischelper \
+ framework/source/fwi/helper/shareablemutex \
+ framework/source/fwi/jobs/configaccess \
+ framework/source/fwi/jobs/jobconst \
+ framework/source/fwi/threadhelp/transactionmanager \
+ framework/source/fwi/uielement/constitemcontainer \
+ framework/source/fwi/uielement/itemcontainer \
+ framework/source/fwi/uielement/rootitemcontainer \
framework/source/jobs/job \
framework/source/jobs/jobdata \
framework/source/jobs/jobdispatch \
@@ -109,6 +142,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/autorecovery \
framework/source/services/desktop \
+ framework/source/services/dispatchhelper \
framework/source/services/frame \
framework/source/services/modulemanager \
framework/source/services/pathsettings \
@@ -179,4 +213,10 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/xml/imagesdocumenthandler \
))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_system_win32_libs,fwk,\
+ advapi32 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index a7252f5cb4d3..1917c57b6551 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_use_libraries,fwl,\
comphelper \
cppu \
cppuhelper \
- fwe \
- fwi \
+ fwk \
i18nlangtag \
sal \
svl \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index fbcc26fc8e51..061a6d362ba7 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,fwm,\
comphelper \
cppu \
cppuhelper \
- fwi \
+ fwk \
sal \
svl \
svt \
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 8b136ac92dc7..7fb48a527b9a 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -20,8 +20,6 @@
$(eval $(call gb_Module_Module,framework))
$(eval $(call gb_Module_add_targets,framework,\
- Library_fwe \
- Library_fwi \
Library_fwk \
Library_fwl \
Library_fwm \
diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index ea19f677c359..9e3aeb9dc812 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <vcl/vclptr.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace com::sun::star::beans { struct PropertyValue; }
namespace com::sun::star::frame { class XFrame; }
@@ -38,7 +38,7 @@ class PopupMenu;
namespace framework
{
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) AddonMenuManager
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) AddonMenuManager
{
public:
static bool HasAddonMenuElements();
diff --git a/framework/inc/classes/actiontriggercontainer.hxx
b/framework/inc/classes/actiontriggercontainer.hxx
index ad01f41111e1..9c318c89a231 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#define SERVICENAME_ACTIONTRIGGERCONTAINER
"com.sun.star.ui.ActionTriggerContainer"
#define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER
"com.sun.star.comp.ui.ActionTriggerContainer"
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx
b/framework/inc/classes/actiontriggerpropertyset.hxx
index 8dd37f068309..9131e3e275b0 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger"
#define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger"
diff --git a/framework/inc/classes/converter.hxx
b/framework/inc/classes/converter.hxx
index a9fdfff9f37a..6c20f4841b18 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <tools/datetime.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
-class UNLESS_MERGELIBS(FWI_DLLPUBLIC) Converter
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) Converter
{
public:
// Seq<beans.NamedValue> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/fwkresid.hxx
b/framework/inc/classes/fwkresid.hxx
index c6606c5271e8..e63ddce86adf 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
#define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <rtl/ustring.hxx>
-FWE_DLLPUBLIC OUString FwkResId(const char* pId);
+FWK_DLLPUBLIC OUString FwkResId(const char* pId);
#endif // __FRAMEWORK_CLASSES_FWKRESID
diff --git a/framework/inc/classes/imagewrapper.hxx
b/framework/inc/classes/imagewrapper.hxx
index 9818552cb4e3..f68d5773a4ad 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/implbase.hxx>
#include <vcl/image.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
diff --git a/framework/inc/classes/protocolhandlercache.hxx
b/framework/inc/classes/protocolhandlercache.hxx
index 7632a72bcd1e..85cc13abf874 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -27,7 +27,7 @@
#include <unotools/configitem.hxx>
#include <rtl/ustring.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
@@ -44,7 +44,7 @@ namespace framework{
This struct holds the information about one such registered protocol
handler.
A list of handler objects is defined as ProtocolHandlerHash. see below
*/
-struct FWI_DLLPUBLIC ProtocolHandler
+struct FWK_DLLPUBLIC ProtocolHandler
{
/* member */
public:
@@ -87,7 +87,7 @@ typedef std::unordered_map<OUString, ProtocolHandler>
HandlerHash;
*/
class HandlerCFGAccess;
-class UNLESS_MERGELIBS(FWI_DLLPUBLIC) HandlerCache final
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) HandlerCache final
{
/* member */
private:
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx
b/framework/inc/classes/rootactiontriggercontainer.hxx
index 42f8766a1797..01bec3510d5c 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER
"com.sun.star.comp.ui.RootActionTriggerContainer"
diff --git a/framework/inc/helper/mischelper.hxx
b/framework/inc/helper/mischelper.hxx
index 5605eff87ebe..fb7033c5b059 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -34,7 +34,7 @@
#include <i18nlangtag/lang.h>
#include <svl/languageoptions.hxx>
#include <rtl/ustring.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
#include <functional>
#include <set>
@@ -115,7 +115,7 @@ public:
css::uno::Reference< css::linguistic2::XLanguageGuessing > const &
GetGuesser() const;
};
-FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
+FWK_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
const css::uno::Reference< css::frame::XFrame > &rxFrame,
const LanguageGuessingHelper & rLangGuessHelper,
SvtScriptType nScriptType,
@@ -245,12 +245,12 @@ class WeakDocumentEventListener final : public
::cppu::WeakImplHelper<css::docum
}
};
-FWI_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener>
+FWK_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener>
GetFirstListenerWith_Impl(
css::uno::Reference<css::uno::XInterface> const& xEventFocus,
std::function<bool
(css::uno::Reference<css::ui::XContextChangeEventListener> const&)> const&
rPredicate);
-FWI_DLLPUBLIC extern auto (*g_pGetMultiplexerListener)(
+FWK_DLLPUBLIC extern auto (*g_pGetMultiplexerListener)(
css::uno::Reference<css::uno::XInterface> const&,
std::function<bool
(css::uno::Reference<css::ui::XContextChangeEventListener> const&)> const&)
-> css::uno::Reference<css::ui::XContextChangeEventListener>;
diff --git a/framework/inc/helper/propertysetcontainer.hxx
b/framework/inc/helper/propertysetcontainer.hxx
index f5f6497305cf..fdbf809c1dbf 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -27,7 +27,7 @@
#include <cppuhelper/weak.hxx>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
diff --git a/framework/inc/helper/shareablemutex.hxx
b/framework/inc/helper/shareablemutex.hxx
index c05bffb47145..81b7a6d5f7ae 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -22,7 +22,7 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
diff --git a/framework/inc/jobs/configaccess.hxx
b/framework/inc/jobs/configaccess.hxx
index c5783ffe975c..392d017e753c 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/ustring.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
@@ -34,7 +34,7 @@ namespace framework{
instead of using specialized config items of the svtools
project. This class can wrap such configuration access.
*/
-class UNLESS_MERGELIBS(FWI_DLLPUBLIC) ConfigAccess final
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ConfigAccess final
{
public:
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 96a60f81af86..1eb839e45dbc 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX
#include <rtl/ustring.hxx>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
@@ -33,7 +33,7 @@ namespace framework{
it's code. Typos can occur or code will be changed by new
developers ...
Shared set of constant values can help to improve the maintenance
of this code.
*/
-class FWI_DLLPUBLIC JobConst
+class FWK_DLLPUBLIC JobConst
{
public:
static const OUString ANSWER_DEACTIVATE_JOB;
diff --git a/framework/inc/menuconfiguration.hxx
b/framework/inc/menuconfiguration.hxx
index 4024f99126ca..f602a4495580 100644
--- a/framework/inc/menuconfiguration.hxx
+++ b/framework/inc/menuconfiguration.hxx
@@ -20,7 +20,7 @@
#pragma once
#include <config_options.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <cppuhelper/weakref.hxx>
@@ -37,7 +37,7 @@ const sal_uInt16 ITEMID_ADDONLIST = 6678; // used
to be a SID in sfx2,
namespace framework
{
-struct FWE_DLLPUBLIC MenuAttributes
+struct FWK_DLLPUBLIC MenuAttributes
{
private:
oslInterlockedCount refCount;
@@ -78,7 +78,7 @@ public:
}
};
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) MenuConfiguration final
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) MenuConfiguration final
{
public:
MenuConfiguration(
diff --git a/framework/inc/pch/precompiled_fwe.cxx
b/framework/inc/pch/precompiled_fwe.cxx
deleted file mode 100644
index 08c5958c11aa..000000000000
--- a/framework/inc/pch/precompiled_fwe.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_fwe.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_fwe.hxx
b/framework/inc/pch/precompiled_fwe.hxx
deleted file mode 100644
index f73501641b71..000000000000
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ /dev/null
@@ -1,168 +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:02 using:
- ./bin/update_pch framework fwe --cutoff=10 --exclude:system --include:module
--exclude:local
-
- If after updating build fails, use the following command to locate
conflicting headers:
- ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwe.hxx "make
framework.build" --find-conflicts
-*/
-
-#if PCH_LEVEL >= 1
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#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 <sstream>
-#include <stddef.h>
-#include <string.h>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#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/endian.h>
-#include <osl/interlck.h>
-#include <osl/mutex.h>
-#include <osl/mutex.hxx>
-#include <osl/thread.h>
-#include <rtl/alloc.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/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/bitmapex.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/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/task.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/drawing/LineCap.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/XInterface.hpp>
-#include <com/sun/star/uno/genfunc.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <comphelper/comphelperdllapi.h>
-#include <cppu/cppudllapi.h>
-#include <cppu/unotype.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
-#include <i18nlangtag/lang.h>
-#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/strong_int.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <o3tl/underlyingenumvalue.hxx>
-#include <salhelper/thread.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/unotoolsdllapi.h>
-#endif // PCH_LEVEL >= 3
-#if PCH_LEVEL >= 4
-#include <framework/fwedllapi.h>
-#endif // PCH_LEVEL >= 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_fwi.cxx
b/framework/inc/pch/precompiled_fwi.cxx
deleted file mode 100644
index 978ffd1d3b9b..000000000000
--- a/framework/inc/pch/precompiled_fwi.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_fwi.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_fwi.hxx
b/framework/inc/pch/precompiled_fwi.hxx
deleted file mode 100644
index 5a911cb2e262..000000000000
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ /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 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:02 using:
- ./bin/update_pch framework fwi --cutoff=9 --exclude:system --include:module
--exclude:local
-
- If after updating build fails, use the following command to locate
conflicting headers:
- ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwi.hxx "make
framework.build" --find-conflicts
-*/
-
-#if PCH_LEVEL >= 1
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <iomanip>
-#include <limits>
-#include <new>
-#include <ostream>
-#include <stddef.h>
-#include <string.h>
-#include <string>
-#include <string_view>
-#include <type_traits>
-#include <utility>
-#endif // PCH_LEVEL >= 1
-#if PCH_LEVEL >= 2
-#include <osl/diagnose.h>
-#include <osl/endian.h>
-#include <osl/interlck.h>
-#include <osl/mutex.h>
-#include <osl/mutex.hxx>
-#include <osl/thread.h>
-#include <rtl/alloc.h>
-#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/ustrbuf.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
-#include <sal/config.h>
-#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
-#include <sal/typesizes.h>
-#endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
-#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/RuntimeException.hpp>
-#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/XInterface.hpp>
-#include <com/sun/star/uno/genfunc.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <cppu/cppudllapi.h>
-#include <cppu/unotype.hxx>
-#include <typelib/typeclass.h>
-#include <typelib/typedescription.h>
-#include <typelib/uik.h>
-#include <uno/any2.h>
-#include <uno/data.h>
-#include <uno/sequence2.h>
-#endif // PCH_LEVEL >= 3
-#if PCH_LEVEL >= 4
-#endif // PCH_LEVEL >= 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_fwk.hxx
b/framework/inc/pch/precompiled_fwk.hxx
index d1cea3b5c800..39c7a24e7361 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -250,8 +250,8 @@
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#include <framework/addonsoptions.hxx>
-#include <framework/fwedllapi.h>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
+#include <framework/fwkdllapi.h>
#include <properties.h>
#include <targets.h>
#endif // PCH_LEVEL >= 4
diff --git a/framework/inc/pch/precompiled_fwl.hxx
b/framework/inc/pch/precompiled_fwl.hxx
index 83439f94e310..6031e80fb914 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -204,7 +204,7 @@
#include <unotools/unotoolsdllapi.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <services.h>
#endif // PCH_LEVEL >= 4
diff --git a/framework/inc/statusbarconfiguration.hxx
b/framework/inc/statusbarconfiguration.hxx
index adfcf623d48f..1a8c6ed95225 100644
--- a/framework/inc/statusbarconfiguration.hxx
+++ b/framework/inc/statusbarconfiguration.hxx
@@ -19,7 +19,7 @@
#pragma once
#include <config_options.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace com::sun::star::container { class XIndexAccess; }
namespace com::sun::star::container { class XIndexContainer; }
@@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class
Reference; }
namespace framework
{
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) StatusBarConfiguration
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) StatusBarConfiguration
{
public:
static bool LoadStatusBar(
diff --git a/framework/inc/toolboxconfiguration.hxx
b/framework/inc/toolboxconfiguration.hxx
index 40df7d0c8655..16d531a4e2aa 100644
--- a/framework/inc/toolboxconfiguration.hxx
+++ b/framework/inc/toolboxconfiguration.hxx
@@ -19,7 +19,7 @@
#pragma once
#include <config_options.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace com::sun::star::container { class XIndexAccess; }
namespace com::sun::star::container { class XIndexContainer; }
@@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class
Reference; }
namespace framework
{
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) ToolBoxConfiguration
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ToolBoxConfiguration
{
public:
static bool LoadToolBox(
diff --git a/framework/inc/uielement/constitemcontainer.hxx
b/framework/inc/uielement/constitemcontainer.hxx
index 063d63280e0d..74d6c58ea80f 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -32,14 +32,14 @@
#include <cppuhelper/propshlp.hxx>
#include <vector>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
class RootItemContainer;
class ItemContainer;
-class UNLESS_MERGELIBS(FWI_DLLPUBLIC) ConstItemContainer final : public
::cppu::WeakImplHelper<
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ConstItemContainer final : public
::cppu::WeakImplHelper<
css::container::XIndexAccess,
css::lang::XUnoTunnel
,
css::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/itemcontainer.hxx
b/framework/inc/uielement/itemcontainer.hxx
index 6b44578a4f71..b38aa6bfe123 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -28,7 +28,7 @@
#include <cppuhelper/implbase.hxx>
#include <vector>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
diff --git a/framework/inc/uielement/rootitemcontainer.hxx
b/framework/inc/uielement/rootitemcontainer.hxx
index 50c46e4a8189..67133ba17f68 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -34,7 +34,7 @@
#include <cppuhelper/propshlp.hxx>
#include <vector>
-#include <framework/fwidllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
@@ -53,9 +53,9 @@ class RootItemContainer final : private cppu::BaseMutex,
friend class ConstItemContainer;
public:
- FWI_DLLPUBLIC RootItemContainer();
- FWI_DLLPUBLIC RootItemContainer( const css::uno::Reference<
css::container::XIndexAccess >& rItemAccessContainer );
- virtual FWI_DLLPUBLIC ~RootItemContainer() override;
+ FWK_DLLPUBLIC RootItemContainer();
+ FWK_DLLPUBLIC RootItemContainer( const css::uno::Reference<
css::container::XIndexAccess >& rItemAccessContainer );
+ virtual FWK_DLLPUBLIC ~RootItemContainer() override;
// XInterface
virtual void SAL_CALL acquire() throw () override
@@ -68,7 +68,7 @@ class RootItemContainer final : private cppu::BaseMutex,
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
// XUnoTunnel
- static FWI_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&
getUnoTunnelId() throw();
+ static FWK_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&
getUnoTunnelId() throw();
sal_Int64 SAL_CALL
getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
// XIndexContainer
diff --git a/framework/inc/xml/menudocumenthandler.hxx
b/framework/inc/xml/menudocumenthandler.hxx
index 236e8359139c..539232c97664 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -29,7 +29,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
diff --git a/framework/inc/xml/saxnamespacefilter.hxx
b/framework/inc/xml/saxnamespacefilter.hxx
index 620ebd03d28c..1af96555d4e0 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -27,7 +27,7 @@
#include <cppuhelper/implbase.hxx>
#include <stack>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework
{
@@ -35,7 +35,7 @@ namespace framework
// workaround for incremental linking bugs in MSVC2015
class SAL_DLLPUBLIC_TEMPLATE SaxNamespaceFilter_Base : public
cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {};
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) SaxNamespaceFilter final : public
SaxNamespaceFilter_Base
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) SaxNamespaceFilter final : public
SaxNamespaceFilter_Base
{
public:
SaxNamespaceFilter( css::uno::Reference<
css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler );
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx
b/framework/inc/xml/statusbardocumenthandler.hxx
index 9dea5b1452fc..4c61e56e8266 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -28,7 +28,7 @@
#include <cppuhelper/implbase.hxx>
#include <unordered_map>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace framework{
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx
b/framework/inc/xml/toolboxdocumenthandler.hxx
index db9184605a38..39196fd4ddc6 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <unordered_map>
diff --git a/framework/inc/xml/xmlnamespaces.hxx
b/framework/inc/xml/xmlnamespaces.hxx
index 5f0c9670e8cf..ed6bb61406e7 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX
#include <map>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <rtl/ustring.hxx>
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx
b/framework/source/fwe/helper/actiontriggerhelper.cxx
index a8fe71861116..aca142bcee8e 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -317,14 +317,14 @@ static void FillActionTriggerContainerWithMenu( const
Menu* pMenu, Reference< XI
for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
{
sal_uInt16 nItemId = pMenu->GetItemId( nPos );
- MenuItemType nType = pMenu->GetItemType( nPos );
+ ::MenuItemType nType = pMenu->GetItemType( nPos );
try
{
Any a;
Reference< XPropertySet > xPropSet;
- if ( nType == MenuItemType::SEPARATOR )
+ if ( nType == ::MenuItemType::SEPARATOR )
{
xPropSet = CreateActionTriggerSeparator(
rActionTriggerContainer );
diff --git a/include/framework/ContextChangeEventMultiplexerTunnel.hxx
b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
index 9fd41166d5b4..bd02b7270ee2 100644
--- a/include/framework/ContextChangeEventMultiplexerTunnel.hxx
+++ b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <functional>
#include <com/sun/star/uno/Reference.hxx>
@@ -18,7 +18,7 @@ namespace com::sun::star::uno { class XInterface; }
namespace framework {
// this is pretty horrible, don't use it!
-FWE_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener>
+FWK_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener>
GetFirstListenerWith(
css::uno::Reference<css::uno::XInterface> const& xEventFocus,
std::function<bool
(css::uno::Reference<css::ui::XContextChangeEventListener> const&)> const&
rPredicate);
diff --git a/include/framework/actiontriggerhelper.hxx
b/include/framework/actiontriggerhelper.hxx
index 9060fdc3b874..ceccea40433b 100644
--- a/include/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
#define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <com/sun/star/uno/Reference.hxx>
namespace com::sun::star::container { class XIndexContainer; }
@@ -29,7 +29,7 @@ class Menu;
namespace framework
{
- class FWE_DLLPUBLIC ActionTriggerHelper
+ class FWK_DLLPUBLIC ActionTriggerHelper
{
public:
// Fills the submitted menu with the structure contained in the
second
diff --git a/include/framework/addonsoptions.hxx
b/include/framework/addonsoptions.hxx
index 0f14b8e2323a..d8b87563e27d 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -24,7 +24,7 @@
#include <vcl/image.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <memory>
namespace osl { class Mutex; }
@@ -45,7 +45,7 @@ namespace osl { class Mutex; }
namespace framework
{
-struct FWE_DLLPUBLIC MergeMenuInstruction
+struct FWK_DLLPUBLIC MergeMenuInstruction
{
OUString aMergePoint;
OUString aMergeCommand;
@@ -56,7 +56,7 @@ struct FWE_DLLPUBLIC MergeMenuInstruction
};
typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer;
-struct FWE_DLLPUBLIC MergeToolbarInstruction
+struct FWK_DLLPUBLIC MergeToolbarInstruction
{
OUString aMergeToolbar;
OUString aMergePoint;
@@ -69,7 +69,7 @@ struct FWE_DLLPUBLIC MergeToolbarInstruction
typedef ::std::vector< MergeToolbarInstruction >
MergeToolbarInstructionContainer;
-struct FWE_DLLPUBLIC MergeNotebookBarInstruction
+struct FWK_DLLPUBLIC MergeNotebookBarInstruction
{
OUString aMergeNotebookBar;
OUString aMergePoint;
@@ -82,7 +82,7 @@ struct FWE_DLLPUBLIC MergeNotebookBarInstruction
typedef ::std::vector< MergeNotebookBarInstruction >
MergeNotebookBarInstructionContainer;
-struct FWE_DLLPUBLIC MergeStatusbarInstruction
+struct FWK_DLLPUBLIC MergeStatusbarInstruction
{
OUString aMergePoint;
OUString aMergeCommand;
@@ -107,7 +107,7 @@ class AddonsOptions_Impl;
@devstatus ready to use
*//*-*************************************************************************************************************/
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) AddonsOptions
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) AddonsOptions
{
public:
AddonsOptions();
diff --git a/include/framework/configimporter.hxx
b/include/framework/configimporter.hxx
index cb8996b90253..eca31271922c 100644
--- a/include/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
#include <config_options.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <vector>
namespace com::sun::star::container { class XIndexContainer; }
@@ -32,7 +32,7 @@ namespace com::sun::star::uno { template <typename > class
Reference; }
namespace framework
{
- class UNLESS_MERGELIBS(FWE_DLLPUBLIC) UIConfigurationImporterOOo1x
+ class UNLESS_MERGELIBS(FWK_DLLPUBLIC) UIConfigurationImporterOOo1x
{
public:
static bool ImportCustomToolbars(
diff --git a/include/framework/desktop.hxx b/include/framework/desktop.hxx
index e49361839a67..3e6e327bddb6 100644
--- a/include/framework/desktop.hxx
+++ b/include/framework/desktop.hxx
@@ -95,7 +95,7 @@ typedef cppu::WeakComponentImplHelper<
css::task::XInteractionHandler ,
css::frame::XUntitledNumbers > Desktop_BASE;
-class LO_DLLPUBLIC_FWK Desktop final : private cppu::BaseMutex,
+class FWK_DLLPUBLIC Desktop final : private cppu::BaseMutex,
public Desktop_BASE,
public cppu::OPropertySetHelper
{
@@ -446,7 +446,7 @@ class LO_DLLPUBLIC_FWK Desktop final : private
cppu::BaseMutex,
}; // class Desktop
-LO_DLLPUBLIC_FWK rtl::Reference<Desktop> getDesktop(
+FWK_DLLPUBLIC rtl::Reference<Desktop> getDesktop(
css::uno::Reference<css::uno::XComponentContext> const & context);
} // namespace framework
diff --git a/include/framework/dispatchhelper.hxx
b/include/framework/dispatchhelper.hxx
index d767b134594c..5c7478f75fe1 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <cppuhelper/implbase.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <osl/conditn.hxx>
namespace com::sun::star::lang
@@ -53,7 +53,7 @@ namespace framework
- dispatching of the URL
All these steps are done inside one method call here.
*/
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) DispatchHelper final
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) DispatchHelper final
: public ::cppu::WeakImplHelper<css::lang::XServiceInfo,
css::frame::XDispatchHelper,
css::frame::XDispatchResultListener>
{
diff --git a/include/framework/documentundoguard.hxx
b/include/framework/documentundoguard.hxx
index c707257a447f..ec1a5951b15c 100644
--- a/include/framework/documentundoguard.hxx
+++ b/include/framework/documentundoguard.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX
#define INCLUDED_FRAMEWORK_DOCUMENTUNDOGUARD_HXX
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <com/sun/star/uno/Reference.hxx>
@@ -42,7 +42,7 @@ namespace framework
as many calls to <member
scope="css::document">XUndoManager::leaveUndoContext</member> as are
necessary to restore the manager's initial state.
*/
- class FWE_DLLPUBLIC DocumentUndoGuard
+ class FWK_DLLPUBLIC DocumentUndoGuard
{
public:
DocumentUndoGuard( const css::uno::Reference< css::uno::XInterface >&
i_undoSupplierComponent );
diff --git a/include/framework/framelistanalyzer.hxx
b/include/framework/framelistanalyzer.hxx
index 4e1797dffebb..df47f90b288a 100644
--- a/include/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
#include <config_options.h>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -58,7 +58,7 @@ namespace framework{
to switch into the backing mode, close the current active frame only or
exit the whole application explicitly or implicitly.
*/
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) FrameListAnalyzer final
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) FrameListAnalyzer final
{
// types
diff --git a/include/framework/fwedllapi.h b/include/framework/fwedllapi.h
deleted file mode 100644
index 3fa4e42cb5c7..000000000000
--- a/include/framework/fwedllapi.h
+++ /dev/null
@@ -1,34 +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 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_FWEDLLAPI_H
-#define INCLUDED_FRAMEWORK_FWEDLLAPI_H
-
-#include <sal/types.h>
-
-#if defined(FWE_DLLIMPLEMENTATION)
-#define FWE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define FWE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-#define FWE_DLLPRIVATE SAL_DLLPRIVATE
-
-#endif // INCLUDED_FRAMEWORK_FWEDLLAPI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/fwidllapi.h b/include/framework/fwidllapi.h
deleted file mode 100644
index 21df058b0912..000000000000
--- a/include/framework/fwidllapi.h
+++ /dev/null
@@ -1,30 +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 .
- */
-
-#pragma once
-
-#include <sal/types.h>
-
-#if defined(FWI_DLLIMPLEMENTATION)
-#define FWI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define FWI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/framework/fwkdllapi.h b/include/framework/fwkdllapi.h
index 57daebb1d5b2..dc580c1bb216 100644
--- a/include/framework/fwkdllapi.h
+++ b/include/framework/fwkdllapi.h
@@ -13,10 +13,10 @@
#include <sal/types.h>
-#if defined LO_DLLIMPLEMENTATION_FWK
-#define LO_DLLPUBLIC_FWK SAL_DLLPUBLIC_EXPORT
+#if defined FWK_DLLIMPLEMENTATION
+#define FWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define LO_DLLPUBLIC_FWK SAL_DLLPUBLIC_IMPORT
+#define FWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/include/framework/interaction.hxx
b/include/framework/interaction.hxx
index ab2fc3eb2fba..4e3df9e8afba 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -24,7 +24,7 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace com::sun::star::task { class XInteractionContinuation; }
namespace com::sun::star::task { class XInteractionRequest; }
@@ -53,13 +53,17 @@ namespace framework{
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
class RequestFilterSelect_Impl;
-class UNLESS_MERGELIBS(FWE_DLLPUBLIC) RequestFilterSelect
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) RequestFilterSelect
{
rtl::Reference<RequestFilterSelect_Impl> mxImpl;
public:
RequestFilterSelect( const OUString& sURL );
~RequestFilterSelect();
+
+ RequestFilterSelect& operator=(RequestFilterSelect const &) = delete; //
MSVC2019 workaround
+ RequestFilterSelect(RequestFilterSelect const &) = delete; // MSVC2019
workaround
+
bool isAbort () const;
OUString getFilter() const;
css::uno::Reference < css::task::XInteractionRequest > GetRequest();
@@ -76,7 +80,7 @@ public:
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
-class FWE_DLLPUBLIC InteractionRequest
+class FWK_DLLPUBLIC InteractionRequest
{
public:
static css::uno::Reference < css::task::XInteractionRequest >
CreateRequest(
diff --git a/include/framework/sfxhelperfunctions.hxx
b/include/framework/sfxhelperfunctions.hxx
index d0ef3ff1180d..0fedd75d11f5 100644
--- a/include/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
#define INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <rtl/ustring.hxx>
namespace com::sun::star::frame { class XFrame; }
@@ -57,31 +57,31 @@ typedef bool ( *pfunc_isDockingWindowVisible)(
namespace framework
{
-FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator(
pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
-FWE_DLLPUBLIC svt::ToolboxController* CreateToolBoxController(
+FWK_DLLPUBLIC pfunc_setToolBoxControllerCreator SetToolBoxControllerCreator(
pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
+FWK_DLLPUBLIC svt::ToolboxController* CreateToolBoxController(
const css::uno::Reference< css::frame::XFrame >& rFrame,
ToolBox* pToolbox,
unsigned short nID,
const OUString& aCommandURL );
-FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator
SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator
pSetStatusBarControllerCreator );
-FWE_DLLPUBLIC svt::StatusbarController* CreateStatusBarController(
+FWK_DLLPUBLIC pfunc_setStatusBarControllerCreator
SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator
pSetStatusBarControllerCreator );
+FWK_DLLPUBLIC svt::StatusbarController* CreateStatusBarController(
const css::uno::Reference< css::frame::XFrame >& rFrame,
StatusBar* pStatusBar,
unsigned short nID,
const OUString& aCommandURL );
-FWE_DLLPUBLIC pfunc_getRefreshToolbars SetRefreshToolbars(
pfunc_getRefreshToolbars pRefreshToolbarsFunc );
-FWE_DLLPUBLIC void RefreshToolbars(
+FWK_DLLPUBLIC pfunc_getRefreshToolbars SetRefreshToolbars(
pfunc_getRefreshToolbars pRefreshToolbarsFunc );
+FWK_DLLPUBLIC void RefreshToolbars(
css::uno::Reference< css::frame::XFrame > const & rFrame );
-FWE_DLLPUBLIC pfunc_createDockingWindow SetDockingWindowCreator(
pfunc_createDockingWindow pCreateDockingWindow );
-FWE_DLLPUBLIC void CreateDockingWindow(
+FWK_DLLPUBLIC pfunc_createDockingWindow SetDockingWindowCreator(
pfunc_createDockingWindow pCreateDockingWindow );
+FWK_DLLPUBLIC void CreateDockingWindow(
const css::uno::Reference< css::frame::XFrame >& rFrame,
const OUString& rResourceURL );
-FWE_DLLPUBLIC pfunc_isDockingWindowVisible SetIsDockingWindowVisible(
pfunc_isDockingWindowVisible pIsDockingWindowVisible );
-FWE_DLLPUBLIC bool IsDockingWindowVisible(
+FWK_DLLPUBLIC pfunc_isDockingWindowVisible SetIsDockingWindowVisible(
pfunc_isDockingWindowVisible pIsDockingWindowVisible );
+FWK_DLLPUBLIC bool IsDockingWindowVisible(
const css::uno::Reference< css::frame::XFrame >& rFrame,
const OUString& rResourceURL );
}
diff --git a/include/framework/titlehelper.hxx
b/include/framework/titlehelper.hxx
index c18f5f502756..1152cf1f7a5f 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -33,7 +33,7 @@
#include <rtl/ustrbuf.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::frame { class XFrame; }
@@ -50,7 +50,7 @@ namespace framework{
@threadsafe
*/
-class FWE_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
+class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
, public ::cppu::WeakImplHelper< css::frame::XTitle
,
css::frame::XTitleChangeBroadcaster,
css::frame::XTitleChangeListener ,
diff --git a/include/framework/transactionmanager.hxx
b/include/framework/transactionmanager.hxx
index 9a93d59ac452..28b2623666d4 100644
--- a/include/framework/transactionmanager.hxx
+++ b/include/framework/transactionmanager.hxx
@@ -22,7 +22,7 @@
#include <config_options.h>
#include <osl/mutex.hxx>
-#include "fwidllapi.h"
+#include "fwkdllapi.h"
#include "gate.hxx"
namespace framework{
@@ -91,7 +91,7 @@ enum EExceptionMode
@devstatus draft
*//*-*************************************************************************************************************/
-class UNLESS_MERGELIBS(FWI_DLLPUBLIC) TransactionManager
+class UNLESS_MERGELIBS(FWK_DLLPUBLIC) TransactionManager
{
// public methods
diff --git a/include/framework/undomanagerhelper.hxx
b/include/framework/undomanagerhelper.hxx
index 07cbdd667a10..eb9986919b90 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
#define INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -110,7 +110,7 @@ namespace framework
the dreaded SolarMutex being locked when they're called, the above
behavior is a compromise between "how it should
be" and "how it can realistically be".
*/
- class FWE_DLLPUBLIC UndoManagerHelper
+ class FWK_DLLPUBLIC UndoManagerHelper
{
public:
UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl );
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index e56d4d8fa76f..fb846e09ee8a 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\
dbtools \
dbu \
editeng \
- fwe \
+ fwk \
i18nlangtag \
sal \
salhelper \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 9397cec20e69..f04d8a1521f2 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\
editeng \
for \
forui \
- fwe \
+ fwk \
i18nlangtag \
rpt \
sal \
diff --git a/scripting/Library_protocolhandler.mk
b/scripting/Library_protocolhandler.mk
index b14add0fe7a6..2037bdb362c4 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\
comphelper \
cppu \
cppuhelper \
- fwe \
+ fwk \
sal \
sfx \
tl \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index d3fb419a28be..abd25d24e15d 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_libraries,sdui,\
editeng \
i18nlangtag \
fwl \
- fwe \
+ fwk \
sal \
salhelper \
sd \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 67a66ef2d211..cb0b099eb37d 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\
cppu \
cppuhelper \
drawinglayer \
- fwe \
+ fwk \
i18nlangtag \
i18nutil \
sal \
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 7ec6d5c85f99..58fe30240dd5 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -308,7 +308,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <framework/fwedllapi.h>
+#include <framework/fwkdllapi.h>
#include <framework/interaction.hxx>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 581b36c133f8..bddf53247817 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6056,8 +6056,6 @@ include/framework/desktop.hxx
include/framework/documentundoguard.hxx
include/framework/framecontainer.hxx
include/framework/framelistanalyzer.hxx
-include/framework/fwedllapi.h
-include/framework/fwidllapi.h
include/framework/gate.hxx
include/framework/imutex.hxx
include/framework/interaction.hxx
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cc8a5b6db665..b56ce6b0b075 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -40,8 +40,6 @@ MERGE_LIBRARY_LIST := \
fps_office \
frm \
fsstorage \
- fwe \
- fwi \
fwk \
fwl \
$(if $(filter WNT,$(OS)),gdipluscanvas) \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index ff2b06626b58..bb2dbb43e946 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
dbtools) \
drawinglayer \
editeng \
- fwe \
+ fwk \
i18nlangtag \
i18nutil \
sal \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7ed0705102be..73d22cafee6c 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
dbtools) \
drawinglayer \
editeng \
- fwe \
+ fwk \
i18nlangtag \
i18nutil \
lng \
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 59ec0ff8abe8..43743256d8b5 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -60,8 +60,6 @@ fuzzer_core_libraries = \
emfio \
filterconfig \
fsstorage \
- fwe \
- fwi \
fwk \
i18npool \
i18nutil \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
