reduce symbol visibility in --enable-mergelibs=more mode

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

3 files changed, 10 insertions, 7 deletions

diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 7305d3659711..c6107dbdc379 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <vector>
@@ -44,7 +45,7 @@ namespace SvtHistoryOptions
 
         @param      eHistory select right history.
     */
-    UNOTOOLS_DLLPUBLIC void Clear(EHistoryType eHistory, const bool bClearPinnedItems = true);
+    UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) void Clear(EHistoryType eHistory, const bool bClearPinnedItems = true);
 
     /** Return the complete specified history list.
 
@@ -60,7 +61,7 @@ namespace SvtHistoryOptions
         bool isReadOnly = false;
         bool isPinned = false;
     };
-    UNOTOOLS_DLLPUBLIC std::vector< HistoryItem > GetList(EHistoryType eHistory);
+    UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) std::vector< HistoryItem > GetList(EHistoryType eHistory);
 
     /** Append a new item to the specified list.
 
@@ -73,18 +74,18 @@ namespace SvtHistoryOptions
         @param sThumbnail  base64 encoded thumbnail of the item
         @param oIsReadOnly item was opened editable or read-only
     */
-    UNOTOOLS_DLLPUBLIC void AppendItem(EHistoryType eHistory, const OUString& sURL,
+    UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) void AppendItem(EHistoryType eHistory, const OUString& sURL,
                                        const OUString& sFilter, const OUString& sTitle,
                                        const std::optional<OUString>& sThumbnail,
                                        std::optional<bool> oIsReadOnly);
 
     /** Delete item from the specified list.
     */
-    UNOTOOLS_DLLPUBLIC void DeleteItem(EHistoryType eHistory, const OUString& sURL,
+    UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) void DeleteItem(EHistoryType eHistory, const OUString& sURL,
                                        const bool bClearPinned = true);
 
     // tdf#38742 - toggle pinned state of an item
-    UNOTOOLS_DLLPUBLIC void TogglePinItem(EHistoryType eHistory, const OUString& sURL);
+    UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) void TogglePinItem(EHistoryType eHistory, const OUString& sURL);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index e96b5a571f28..c23ffde15227 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
 #define INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
 
+#include <config_options.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <unotools/unotoolsdllapi.h>
 
@@ -26,7 +27,7 @@
 
 namespace utl
 {
-    class UNOTOOLS_DLLPUBLIC LocalFileHelper
+    class UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) LocalFileHelper
     {
     public:
         static          css::uno::Sequence< OUString >
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 8acc64b1f905..ed04d3b268cd 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 #define INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 
+#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
@@ -74,7 +75,7 @@ namespace utl
         You'll usually never use this class directly, but only as parameter for a
         ->SharedUNOComponent class.
     */
-    class UNOTOOLS_DLLPUBLIC CloseableComponent
+    class UNLESS_MERGELIBS_MORE(UNOTOOLS_DLLPUBLIC) CloseableComponent
     {
     private:
         /** Our IMPL class.