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.grandin@collabora.co.uk>

37 files changed, 94 insertions, 492 deletions

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 );