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>

15 files changed, 33 insertions, 18 deletions

diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 4c3b6c4900e4..0c88de8317ec 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_INC_GALLERYCONTROL_HXX
 #define INCLUDED_SVX_INC_GALLERYCONTROL_HXX
 
+#include <config_options.h>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <svx/svxdllapi.h>
 
@@ -33,7 +34,7 @@ class Splitter;
 namespace svx { namespace sidebar {
 
 
-class SVXCORE_DLLPUBLIC GalleryControl final : public PanelLayout
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryControl final : public PanelLayout
 {
 public:
     GalleryControl( vcl::Window* pParentWindow );
diff --git a/svx/inc/extrud3d.hxx b/svx/inc/extrud3d.hxx
index 124e7e93da2d..8b6d99d9ecf1 100644
--- a/svx/inc/extrud3d.hxx
+++ b/svx/inc/extrud3d.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
 #include <svx/obj3d.hxx>
@@ -34,7 +35,7 @@ class E3dDefaultAttributes;
 |*
 \************************************************************************/
 
-class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject
+class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dExtrudeObj final : public E3dCompoundObject
 {
 private:
     // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 9b4fd310f76f..77869d28a1f6 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_INC_GALOBJ_HXX
 #define INCLUDED_SVX_INC_GALOBJ_HXX
 
+#include <config_options.h>
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
@@ -40,7 +41,7 @@ enum GalSoundType
     SOUND_ANIMAL = 7
 };
 
-class SVXCORE_DLLPUBLIC SgaObject
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SgaObject
 {
     friend class GalleryTheme;
 
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
index 4a2d7cc4a101..a97104cc412e 100644
--- a/svx/inc/polygn3d.hxx
+++ b/svx/inc/polygn3d.hxx
@@ -19,10 +19,11 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
-class SVXCORE_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompoundObject
 {
     // parameters
     basegfx::B3DPolyPolygon aPolyPoly3D;
diff --git a/svx/inc/sdgcoitm.hxx b/svx/inc/sdgcoitm.hxx
index 23b7825bfeb9..7d77643aeea5 100644
--- a/svx/inc/sdgcoitm.hxx
+++ b/svx/inc/sdgcoitm.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxdllapi.h>
@@ -27,7 +28,7 @@
 // SdrGrafRedItem -
 
 
-class SVXCORE_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafRedItem : public SdrSignedPercentItem
 {
 public:
 
@@ -41,7 +42,7 @@ public:
 // SdrGrafGreenItem -
 
 
-class SVXCORE_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafGreenItem : public SdrSignedPercentItem
 {
 public:
 
@@ -55,7 +56,7 @@ public:
 // SdrGrafBlueItem -
 
 
-class SVXCORE_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafBlueItem : public SdrSignedPercentItem
 {
 public:
 
diff --git a/svx/inc/sdgtritm.hxx b/svx/inc/sdgtritm.hxx
index 87b39d863b4e..001e30e7d712 100644
--- a/svx/inc/sdgtritm.hxx
+++ b/svx/inc/sdgtritm.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svxdllapi.h>
@@ -27,7 +28,7 @@
 // SdrGrafTransparenceItem -
 
 
-class SVXCORE_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafTransparenceItem : public SdrPercentItem
 {
 public:
 
diff --git a/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
index 6f914a87549c..772ec070294a 100644
--- a/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <config_options.h>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/svdpage.hxx>
@@ -29,7 +30,7 @@ class SdrObject;
 
 namespace sdr { namespace contact {
 
-class SVXCORE_DLLPUBLIC ObjectContactPainter : public ObjectContact
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) ObjectContactPainter : public ObjectContact
 {
 protected:
     // Hierarchy access methods
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index cda823242108..96381b7de3cf 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_CELL_HXX
 #define INCLUDED_SVX_SOURCE_INC_CELL_HXX
 
+#include <config_options.h>
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -44,7 +45,7 @@ namespace sdr { namespace properties {
 namespace sdr { namespace table {
 
 
-class SVXCORE_DLLPUBLIC Cell :  public SdrText,
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Cell :  public SdrText,
                 public SvxUnoTextBase,
                 public css::table::XMergeableCell,
                 public css::awt::XLayoutConstrains,
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 1b679c39a613..f3d39189f67b 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 #define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 
+#include <config_options.h>
 #include <vcl/builder.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
@@ -368,7 +369,7 @@ namespace svxform
                                                   const SfxPoolItem* pState ) override;
     };
 
-    class SVXCORE_DLLPUBLIC DataNavigatorManager : public SfxChildWindow
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) DataNavigatorManager : public SfxChildWindow
     {
     public:
         SVX_DLLPRIVATE DataNavigatorManager( vcl::Window* pParent, sal_uInt16 nId,
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 72a40e908f94..4bffa6c185d0 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
 
+#include <config_options.h>
 #include <sal/config.h>
 
 #include <set>
@@ -44,7 +45,7 @@ namespace svxform
 
     //= OLocalExchange
 
-    class SVXCORE_DLLPUBLIC OLocalExchange : public TransferableHelper
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) OLocalExchange : public TransferableHelper
     {
     private:
         Link<OLocalExchange&,void>  m_aClipboardListener;
@@ -89,7 +90,7 @@ namespace svxform
     //= OLocalExchangeHelper
 
     /// a helper for navigator windows (SvTreeListBox'es) which allow DnD within themself
-    class SVXCORE_DLLPUBLIC OLocalExchangeHelper
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) OLocalExchangeHelper
     {
     protected:
         VclPtr<vcl::Window>            m_pDragSource;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 51384c8f279e..4d18c2783ef8 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX
 
+#include <config_options.h>
 #include <svl/lstner.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <vcl/window.hxx>
@@ -532,7 +533,7 @@ namespace svxform
     };
 
 
-    class SVXCORE_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) NavigatorFrameManager : public SfxChildWindow
     {
     public:
         SVX_DLLPRIVATE NavigatorFrameManager( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index c8f87a5dc1f1..4f7467f493ce 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMOBJ_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMOBJ_HXX
 
+#include <config_options.h>
 #include <svx/svdouno.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/form/XForms.hpp>
@@ -27,7 +28,7 @@
 
 // FmFormObj
 
-class SVXCORE_DLLPUBLIC FmFormObj : public SdrUnoObj
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmFormObj : public SdrUnoObj
 {
     FmFormObj( const FmFormObj& ) = delete;
 
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 9a55609bc7f8..1e2b63207113 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX
 
+#include <config_options.h>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XForm.hpp>
@@ -112,7 +113,7 @@ public:
 
     /** returns an object mapping from control models to drawing shapes.
     */
-    SVXCORE_DLLPUBLIC css::uno::Reference< css::container::XMap > getControlToShapeMap();
+    UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) css::uno::Reference< css::container::XMap > getControlToShapeMap();
 
 private:
     /** validates whether <member>xCurrentForm</member> is still valid and to be used
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 16cd751d1051..8bba0fbefe20 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX
 
+#include <config_options.h>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
@@ -144,7 +145,7 @@ struct SdrViewEvent;
 class FmFormShell;
 class FmFormView;
 class FmFormObj;
-class SVXCORE_DLLPUBLIC FmXFormShell final : public FmXFormShell_BASE
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmXFormShell final : public FmXFormShell_BASE
                                     ,public FmXFormShell_CFGBASE
                                     ,public svx::IControllerFeatureInvalidation
 {
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 514e9d8f8032..a0fef7fa1d5e 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 #define INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 
+#include <config_options.h>
 #include <svx/ParseContext.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -43,7 +44,7 @@ namespace svxform
 {
     //= OSQLParserClient
 
-    class SVXCORE_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient
+    class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) OSQLParserClient : public ::svxform::OParseContextClient
     {
     protected:
         mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser;