make more classes private in mergedlibs mode

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

10 files changed, 20 insertions, 10 deletions

diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index 45d8d0948c89..ea19f677c359 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include <rtl/ustring.hxx>
 #include <vcl/vclptr.hxx>
 
@@ -37,7 +38,7 @@ class PopupMenu;
 namespace framework
 {
 
-class FWE_DLLPUBLIC AddonMenuManager
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) AddonMenuManager
 {
     public:
         static bool       HasAddonMenuElements();
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 1df3a6a050ab..15d36a5f0d0d 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 
+#include <config_options.h>
 #include <vector>
 
 #include <com/sun/star/uno/Sequence.hxx>
@@ -30,7 +31,7 @@
 
 namespace framework{
 
-class FWI_DLLPUBLIC Converter
+class UNLESS_MERGELIBS(FWI_DLLPUBLIC) Converter
 {
     public:
         // Seq<beans.NamedValue> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 6baaf15343e7..fa7907927d13 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 #define INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 
+#include <config_options.h>
 #include <unordered_map>
 
 #include <com/sun/star/util/URL.hpp>
@@ -86,7 +87,7 @@ typedef std::unordered_map<OUString, ProtocolHandler> HandlerHash;
 */
 
 class HandlerCFGAccess;
-class FWI_DLLPUBLIC HandlerCache final
+class UNLESS_MERGELIBS(FWI_DLLPUBLIC) HandlerCache final
 {
     /* member */
     private:
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index cd77b42a298d..1bb8e01103da 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 #define INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 
+#include <config_options.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <rtl/ustring.hxx>
@@ -33,7 +34,7 @@ namespace framework{
             instead of using specialized config items of the svtools
             project. This class can wrap such configuration access.
  */
-class FWI_DLLPUBLIC ConfigAccess final
+class UNLESS_MERGELIBS(FWI_DLLPUBLIC) ConfigAccess final
 {
 
     public:
diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx
index 312608a7ecc9..4024f99126ca 100644
--- a/framework/inc/menuconfiguration.hxx
+++ b/framework/inc/menuconfiguration.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <framework/fwedllapi.h>
 
 #include <cppuhelper/weakref.hxx>
@@ -77,7 +78,7 @@ public:
     }
 };
 
-class FWE_DLLPUBLIC MenuConfiguration final
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) MenuConfiguration final
 {
 public:
         MenuConfiguration(
diff --git a/framework/inc/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx
index b4d8ceecfc4c..adfcf623d48f 100644
--- a/framework/inc/statusbarconfiguration.hxx
+++ b/framework/inc/statusbarconfiguration.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include <framework/fwedllapi.h>
 
 namespace com::sun::star::container { class XIndexAccess; }
@@ -30,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 namespace framework
 {
 
-class FWE_DLLPUBLIC StatusBarConfiguration
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) StatusBarConfiguration
 {
     public:
         static bool LoadStatusBar(
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index e909900958ea..9dbdc3b38e57 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
 #define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
 
+#include <config_options.h>
 #include <threadhelp/gate.hxx>
 
 #include <osl/mutex.hxx>
@@ -91,7 +92,7 @@ enum EExceptionMode
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class FWI_DLLPUBLIC TransactionManager
+class UNLESS_MERGELIBS(FWI_DLLPUBLIC) TransactionManager
 {
 
     //  public methods
diff --git a/framework/inc/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx
index a0a04ccaceba..40df7d0c8655 100644
--- a/framework/inc/toolboxconfiguration.hxx
+++ b/framework/inc/toolboxconfiguration.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include <framework/fwedllapi.h>
 
 namespace com::sun::star::container { class XIndexAccess; }
@@ -30,7 +31,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 namespace framework
 {
 
-class FWE_DLLPUBLIC ToolBoxConfiguration
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) ToolBoxConfiguration
 {
     public:
         static bool LoadToolBox(
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index c4a384597e65..43f10597c4a7 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 
+#include <config_options.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
@@ -38,7 +39,7 @@ namespace framework
 
 class RootItemContainer;
 class ItemContainer;
-class FWI_DLLPUBLIC ConstItemContainer final : public ::cppu::WeakImplHelper<
+class UNLESS_MERGELIBS(FWI_DLLPUBLIC) ConstItemContainer final : public ::cppu::WeakImplHelper<
                                                     css::container::XIndexAccess,
                                                     css::lang::XUnoTunnel       ,
                                                     css::beans::XFastPropertySet,
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 5222d7454283..620ebd03d28c 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 #define INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 
+#include <config_options.h>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xml/xmlnamespaces.hxx>
 #include <rtl/ustring.hxx>
@@ -34,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 FWE_DLLPUBLIC SaxNamespaceFilter final : public SaxNamespaceFilter_Base
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) SaxNamespaceFilter final : public SaxNamespaceFilter_Base
 {
     public:
         SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler > const & rSax1DocumentHandler );