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, 17 insertions, 12 deletions

diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 41c47bd54edc..ea18f8ba4fc0 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
 #define INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX
 
+#include <config_options.h>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 
@@ -56,7 +57,7 @@ namespace basegfx
         All usages should handle instances of BColorModifier encapsulated
         into these shared pointers.
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier
     {
     private:
         BColorModifier(const BColorModifier&) = delete;
@@ -84,7 +85,7 @@ namespace basegfx
 
     /** convert color to gray
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gray final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_gray final : public BColorModifier
     {
     public:
         BColorModifier_gray()
@@ -105,7 +106,7 @@ namespace basegfx
 
         returns a color where red green and blue are inverted using 1.0 - n
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_invert final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_invert final : public BColorModifier
     {
     public:
         BColorModifier_invert()
@@ -153,7 +154,7 @@ namespace basegfx
         given color, replacing everything. Useful e.g. for unified shadow
         creation
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_replace final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_replace final : public BColorModifier
     {
     private:
         ::basegfx::BColor           maBColor;
@@ -212,7 +213,7 @@ namespace basegfx
         returns black when the luminance of the given color is less than
         the given threshold value in the range [0.0 .. 1.0], else white
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_black_and_white final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_black_and_white final : public BColorModifier
     {
     private:
         double                      mfValue;
@@ -240,7 +241,7 @@ namespace basegfx
 
         col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0)
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_gamma final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_gamma final : public BColorModifier
     {
     private:
         double                      mfValue;
@@ -268,7 +269,7 @@ namespace basegfx
         - be able to cover a bigger change range utilizing the combination
         - allow execution by a small, common, precalculated table
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_RGBLuminanceContrast final : public BColorModifier
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_RGBLuminanceContrast final : public BColorModifier
     {
     private:
         double                      mfRed;
@@ -307,7 +308,7 @@ namespace basegfx
         All references to BColorModifier members use shared pointers, thus instances of
         BColorModifierStack can be copied by the default mechanisms if needed.
     */
-    class BASEGFX_DLLPUBLIC BColorModifierStack final
+    class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifierStack final
     {
         ::std::vector< BColorModifierSharedPtr >        maBColorModifiers;
 
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index 6333d2d17876..82bee12e37bf 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
 #define INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
 
+#include <config_options.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
@@ -31,7 +32,7 @@ namespace basegfx { class B2DPoint; }
 namespace basegfx
 {
     // class to hold a single trapezoid
-    class BASEGFX_DLLPUBLIC B2DTrapezoid
+    class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) B2DTrapezoid
     {
     private:
         // Geometry data. YValues are down-oriented, this means bottom should
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 19c93770dd11..acffe04471cb 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
 #define INCLUDED_BASEGFX_RASTER_RASTERCONVERT3D_HXX
 
+#include <config_options.h>
 #include <sal/types.h>
 #include <vector>
 
@@ -408,7 +409,7 @@ namespace basegfx
 
 namespace basegfx
 {
-    class BASEGFX_DLLPUBLIC RasterConverter3D : public InterpolatorProvider3D
+    class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) RasterConverter3D : public InterpolatorProvider3D
     {
     private:
         // the line entries for an area conversion run
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index fd23e1fb2810..9237517beb0f 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
 #define INCLUDED_BASEGFX_TUPLE_B3DTUPLE_HXX
 
+#include <config_options.h>
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/basegfxdllapi.h>
@@ -36,7 +37,7 @@ namespace basegfx
         @derive Use this class to implement Points or Vectors
         which are based on three double values
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3DTuple
+    class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) B3DTuple
     {
     protected:
         double                                      mfX;
diff --git a/include/basegfx/utils/gradienttools.hxx b/include/basegfx/utils/gradienttools.hxx
index 5714fc1802f1..97101adf2201 100644
--- a/include/basegfx/utils/gradienttools.hxx
+++ b/include/basegfx/utils/gradienttools.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASEGFX_UTILS_GRADIENTTOOLS_HXX
 #define INCLUDED_BASEGFX_UTILS_GRADIENTTOOLS_HXX
 
+#include <config_options.h>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -35,7 +36,7 @@ namespace basegfx
         1.2-compatible gradients. Use the createXXXODFGradientInfo()
         methods below for initializing from ODF attributes.
      */
-    class BASEGFX_DLLPUBLIC ODFGradientInfo
+    class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) ODFGradientInfo
     {
     private:
         /** transformation mapping from [0,1]^2 texture coordinate