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>

8 files changed, 16 insertions, 9 deletions

diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index 6f1b1700d049..34e256176683 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_ZIPPACKAGEHELPER_HXX
 #define INCLUDED_UNOTOOLS_ZIPPACKAGEHELPER_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/uno/XInterface.hpp>
@@ -29,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponen
 
 namespace utl {
 
-class UNOTOOLS_DLLPUBLIC ZipPackageHelper
+class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ZipPackageHelper
 {
 public:
     ZipPackageHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index 5e16b931d707..447c33b64942 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -113,7 +113,7 @@ namespace utl
 
     public:
         // singleton impl-class
-        class Impl;
+        class UNOTOOLS_DLLPRIVATE Impl;
         static const Impl& data(); // the data related to the bootstrap.ini file
     };
 }
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 4190f76b5829..708f6acc9292 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 #define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/uno/Type.hxx>
 #include <memory>
@@ -54,7 +55,7 @@ namespace utl
         before your base class' dtor is called, so accessing the memory during such a theoretical auto-commit would
         yield undefined behaviour.</p>
     */
-    class UNOTOOLS_DLLPUBLIC OConfigurationValueContainer
+    class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) OConfigurationValueContainer
     {
     private:
         std::unique_ptr<OConfigurationValueContainerImpl> m_pImpl;
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 473bf2c0f2fe..0d230d357c40 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
 #define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 
 namespace utl
@@ -49,11 +50,11 @@ namespace utl
         /** registers a listener which should be notified when the desktop terminates
             (which means the application is shutting down)
         */
-        UNOTOOLS_DLLPUBLIC void    registerTerminationListener( ITerminationListener* _pListener );
+        UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) void registerTerminationListener( ITerminationListener* _pListener );
 
         /** revokes a termination listener
         */
-        UNOTOOLS_DLLPUBLIC void    revokeTerminationListener( ITerminationListener const * _pListener );
+        UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) void revokeTerminationListener( ITerminationListener const * _pListener );
     }
 
 } // namespace utl
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index d98d13080040..ae7e5c0cfb7e 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_FONTCFG_HXX
 #define INCLUDED_UNOTOOLS_FONTCFG_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <tools/solar.h>
 #include <tools/fontenum.hxx>
@@ -134,7 +135,7 @@ struct UNOTOOLS_DLLPUBLIC FontNameAttr
     ImplFontAttrs                       Type;
 };
 
-class UNOTOOLS_DLLPUBLIC FontSubstConfiguration
+class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) FontSubstConfiguration
 {
 private:
     css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 7a8bf90d7c4f..887041f6f15b 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -23,6 +23,7 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <config_options.h>
 
 enum class SubsFontFlags
 {
@@ -40,7 +41,7 @@ UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, SubsFontFlag
 UNOTOOLS_DLLPUBLIC void AddTokenFontName( OUString& rName, const OUString& rNewToken );
 
 
-class UNOTOOLS_DLLPUBLIC ConvertChar
+class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ConvertChar
 {
 public:
     const sal_Unicode*  mpCvtTab;
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index bc0ff705635e..88eb22f30c60 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <com/sun/star/uno/Reference.hxx>
@@ -32,7 +33,7 @@ namespace com { namespace sun { namespace star {
 
 namespace com { namespace sun { namespace star { namespace i18n { class XNativeNumberSupplier2; } } } }
 
-class UNOTOOLS_DLLPUBLIC NativeNumberWrapper
+class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) NativeNumberWrapper
 {
     css::uno::Reference< css::i18n::XNativeNumberSupplier2 >   xNNS;
                                 NativeNumberWrapper( const NativeNumberWrapper& ) = delete;
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index 1a0794b492d5..3eac0e979840 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
 #define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
@@ -29,7 +30,7 @@ namespace com::sun::star::task { class XStatusIndicator; }
 namespace utl
 {
 
-class UNOTOOLS_DLLPUBLIC ProgressHandlerWrap final : public ::cppu::WeakImplHelper< css::ucb::XProgressHandler >
+class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ProgressHandlerWrap final : public ::cppu::WeakImplHelper< css::ucb::XProgressHandler >
 {
     css::uno::Reference< css::task::XStatusIndicator > m_xStatusIndicator;