From 01159643623de55f9e1de84d568032ca919dbd8f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 20 Mar 2020 16:07:46 +0200
Subject: 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>
---
 include/svl/aeitem.hxx   | 3 ++-
 include/svl/style.hxx    | 3 ++-
 include/svl/zforlist.hxx | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'include/svl')

diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 9778b67e8ad9..550c88d57647 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVL_AEITEM_HXX
 #define INCLUDED_SVL_AEITEM_HXX
 
+#include <config_options.h>
 #include <svl/svldllapi.h>
 #include <svl/eitem.hxx>
 
@@ -26,7 +27,7 @@
 #include <memory>
 #include <vector>
 
-class SVL_DLLPUBLIC SfxAllEnumItem final : public SfxPoolItem
+class UNLESS_MERGELIBS(SVL_DLLPUBLIC) SfxAllEnumItem final : public SfxPoolItem
 {
     std::vector<OUString>   m_Values;
 
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 24656eb2318a..fd27d8ebdf70 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVL_STYLE_HXX
 #define INCLUDED_SVL_STYLE_HXX
 
+#include <config_options.h>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
@@ -340,7 +341,7 @@ public:
                         { return pStyleSh; }
 };
 
-class SVL_DLLPUBLIC SfxStyleSheetModifiedHint final : public SfxStyleSheetHint
+class UNLESS_MERGELIBS(SVL_DLLPUBLIC) SfxStyleSheetModifiedHint final : public SfxStyleSheetHint
 {
     OUString            aName;
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index e4bf851690f1..70371d59a1bd 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVL_ZFORLIST_HXX
 #define INCLUDED_SVL_ZFORLIST_HXX
 
+#include <config_options.h>
 #include <svl/svldllapi.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
@@ -306,7 +307,7 @@ typedef ::std::set< LanguageType > NfInstalledLocales;
 
 /** Language/country dependent currency entries
  */
-class SVL_DLLPUBLIC NfCurrencyEntry
+class UNLESS_MERGELIBS(SVL_DLLPUBLIC) NfCurrencyEntry
 {
     OUString        aSymbol;            /// currency symbol
     OUString        aBankSymbol;        /// currency abbreviation
-- 
cgit