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>

5 files changed, 10 insertions, 5 deletions

diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 1f4c728d1656..deb53e2a1e7e 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
 #define INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
 
+#include <config_options.h>
 #include <sal/types.h>
 #include <vcl/image.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -106,7 +107,7 @@ class AddonsOptions_Impl;
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class FWE_DLLPUBLIC AddonsOptions
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) AddonsOptions
 {
     public:
          AddonsOptions();
diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx
index ac5156b5328f..cb8996b90253 100644
--- a/include/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
 #define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
 
+#include <config_options.h>
 #include <framework/fwedllapi.h>
 #include <vector>
 
@@ -31,7 +32,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace framework
 {
-    class FWE_DLLPUBLIC UIConfigurationImporterOOo1x
+    class UNLESS_MERGELIBS(FWE_DLLPUBLIC) UIConfigurationImporterOOo1x
     {
         public:
             static bool ImportCustomToolbars(
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index 100ef2d859a9..d767b134594c 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
 #define INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
 
+#include <config_options.h>
 #include <com/sun/star/frame/XDispatchHelper.hpp>
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -52,7 +53,7 @@ namespace framework
                     - dispatching of the URL
                 All these steps are done inside one method call here.
 */
-class FWE_DLLPUBLIC DispatchHelper final
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) DispatchHelper final
     : public ::cppu::WeakImplHelper<css::lang::XServiceInfo, css::frame::XDispatchHelper,
                                     css::frame::XDispatchResultListener>
 {
diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx
index f8403fcc52ba..4e1797dffebb 100644
--- a/include/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
 #define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
 
+#include <config_options.h>
 #include <framework/fwedllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -57,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 FWE_DLLPUBLIC FrameListAnalyzer final
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) FrameListAnalyzer final
 {
 
     // types
diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx
index 2e817bb74275..ab2fc3eb2fba 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX
 #define INCLUDED_FRAMEWORK_INTERACTION_HXX
 
+#include <config_options.h>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -52,7 +53,7 @@ namespace framework{
     @threadsafe     no (used on once position only!)
 *//*-*************************************************************************************************************/
 class RequestFilterSelect_Impl;
-class FWE_DLLPUBLIC RequestFilterSelect
+class UNLESS_MERGELIBS(FWE_DLLPUBLIC) RequestFilterSelect
 {
     rtl::Reference<RequestFilterSelect_Impl> mxImpl;