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>

16 files changed, 47 insertions, 107 deletions

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