make some symbols private

Change-Id: I224831ad18e754fd67d9b16510cd286a5397f1f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98236
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

14 files changed, 20 insertions, 27 deletions

diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index 9e3aeb9dc812..dbffa8c1e495 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -38,7 +38,7 @@ class PopupMenu;
 namespace framework
 {
 
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) AddonMenuManager
+class AddonMenuManager
 {
     public:
         static bool       HasAddonMenuElements();
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 6c20f4841b18..7841a237d905 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -31,7 +31,7 @@
 
 namespace framework{
 
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) Converter
+class Converter
 {
     public:
         // Seq<beans.NamedValue> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index e63ddce86adf..bd5119046297 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
 
-#include <framework/fwkdllapi.h>
 #include <rtl/ustring.hxx>
 
-FWK_DLLPUBLIC OUString FwkResId(const char* pId);
+OUString FwkResId(const char* pId);
 
 #endif // __FRAMEWORK_CLASSES_FWKRESID
 
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 85cc13abf874..849a7f548144 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -27,7 +27,6 @@
 
 #include <unotools/configitem.hxx>
 #include <rtl/ustring.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
@@ -44,7 +43,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 FWK_DLLPUBLIC ProtocolHandler
+struct ProtocolHandler
 {
     /* member */
     public:
@@ -87,7 +86,7 @@ typedef std::unordered_map<OUString, ProtocolHandler> HandlerHash;
 */
 
 class HandlerCFGAccess;
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) HandlerCache final
+class HandlerCache final
 {
     /* member */
     private:
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index fb7033c5b059..4dcb94003449 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -34,7 +34,6 @@
 #include <i18nlangtag/lang.h>
 #include <svl/languageoptions.hxx>
 #include <rtl/ustring.hxx>
-#include <framework/fwkdllapi.h>
 
 #include <functional>
 #include <set>
@@ -115,7 +114,7 @@ public:
     css::uno::Reference< css::linguistic2::XLanguageGuessing > const &  GetGuesser() const;
 };
 
-FWK_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
+void FillLangItems( std::set< OUString > &rLangItems,
         const css::uno::Reference< css::frame::XFrame > &rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
         SvtScriptType    nScriptType,
@@ -245,12 +244,12 @@ class WeakDocumentEventListener final : public ::cppu::WeakImplHelper<css::docum
         }
 };
 
-FWK_DLLPUBLIC css::uno::Reference<css::ui::XContextChangeEventListener>
+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);
 
-FWK_DLLPUBLIC extern auto (*g_pGetMultiplexerListener)(
+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/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 392d017e753c..fc0dce8d6068 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -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(FWK_DLLPUBLIC) ConfigAccess final
+class ConfigAccess final
 {
 
     public:
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 1eb839e45dbc..0c2705011a5b 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX
 
 #include <rtl/ustring.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
@@ -33,7 +32,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 FWK_DLLPUBLIC JobConst
+class JobConst
 {
     public:
         static const OUString ANSWER_DEACTIVATE_JOB;
diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx
index f602a4495580..0c8ae43545bd 100644
--- a/framework/inc/menuconfiguration.hxx
+++ b/framework/inc/menuconfiguration.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <config_options.h>
-#include <framework/fwkdllapi.h>
 
 #include <cppuhelper/weakref.hxx>
 
@@ -37,7 +36,7 @@ const sal_uInt16 ITEMID_ADDONLIST           = 6678; // used to be a SID in sfx2,
 namespace framework
 {
 
-struct FWK_DLLPUBLIC MenuAttributes
+struct MenuAttributes
 {
 private:
     oslInterlockedCount refCount;
@@ -78,7 +77,7 @@ public:
     }
 };
 
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) MenuConfiguration final
+class MenuConfiguration final
 {
 public:
         MenuConfiguration(
diff --git a/framework/inc/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx
index 1a8c6ed95225..262e08613839 100644
--- a/framework/inc/statusbarconfiguration.hxx
+++ b/framework/inc/statusbarconfiguration.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 namespace framework
 {
 
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) StatusBarConfiguration
+class StatusBarConfiguration
 {
     public:
         static bool LoadStatusBar(
diff --git a/framework/inc/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx
index 16d531a4e2aa..0981a8780f82 100644
--- a/framework/inc/toolboxconfiguration.hxx
+++ b/framework/inc/toolboxconfiguration.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 namespace framework
 {
 
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ToolBoxConfiguration
+class ToolBoxConfiguration
 {
     public:
         static bool LoadToolBox(
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 74d6c58ea80f..c70bcae8ca21 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -39,7 +39,7 @@ namespace framework
 
 class RootItemContainer;
 class ItemContainer;
-class UNLESS_MERGELIBS(FWK_DLLPUBLIC) ConstItemContainer final : public ::cppu::WeakImplHelper<
+class ConstItemContainer final : public ::cppu::WeakImplHelper<
                                                     css::container::XIndexAccess,
                                                     css::lang::XUnoTunnel       ,
                                                     css::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 67133ba17f68..cc12b5fa18f5 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
-#include <framework/fwkdllapi.h>
 
 namespace framework
 {
@@ -53,9 +52,9 @@ class RootItemContainer final : private cppu::BaseMutex,
     friend class ConstItemContainer;
 
     public:
-        FWK_DLLPUBLIC RootItemContainer();
-        FWK_DLLPUBLIC RootItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer );
-        virtual FWK_DLLPUBLIC ~RootItemContainer() override;
+        RootItemContainer();
+        RootItemContainer( const css::uno::Reference< css::container::XIndexAccess >& rItemAccessContainer );
+        virtual ~RootItemContainer() override;
 
         // XInterface
         virtual void SAL_CALL acquire() throw () override
@@ -68,7 +67,7 @@ class RootItemContainer final : private cppu::BaseMutex,
         virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XUnoTunnel
-        static FWK_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&   getUnoTunnelId() throw();
+        static 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 539232c97664..5e28a94f8ca8 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -29,7 +29,6 @@
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <framework/fwkdllapi.h>
 
 namespace framework{
 
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 1af96555d4e0..1ed4c34dd44f 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -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(FWK_DLLPUBLIC) SaxNamespaceFilter final : public SaxNamespaceFilter_Base
+class SaxNamespaceFilter final : public SaxNamespaceFilter_Base
 {
     public:
         SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler );