hide more symbols

using the bin/find-can-be-private-symbols.py script
to find classes with large numbers of exported symbols
that can hidden.

before
exported       = 58104
imported       = 30810
unused_exports = 35433

after
exported       = 55094
imported       = 31073
unused_exports = 32423

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

3 files changed, 13 insertions, 11 deletions

diff --git a/svx/inc/extrud3d.hxx b/svx/inc/extrud3d.hxx
index 2b8f39d282bd..cd6c2e00972b 100644
--- a/svx/inc/extrud3d.hxx
+++ b/svx/inc/extrud3d.hxx
@@ -35,7 +35,7 @@ class E3dDefaultAttributes;
 |*
 \************************************************************************/
 
-class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dExtrudeObj final : public E3dCompoundObject
+class SAL_WARN_UNUSED E3dExtrudeObj final : public E3dCompoundObject
 {
 private:
     // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
@@ -53,7 +53,7 @@ private:
     virtual ~E3dExtrudeObj() override;
 
 public:
-    E3dExtrudeObj(
+    SVXCORE_DLLPUBLIC E3dExtrudeObj(
         SdrModel& rSdrModel,
         const E3dDefaultAttributes& rDefault,
         basegfx::B2DPolyPolygon aPP,
diff --git a/svx/inc/galleryfilestorage.hxx b/svx/inc/galleryfilestorage.hxx
index b347021f6640..886bcd7d53d5 100644
--- a/svx/inc/galleryfilestorage.hxx
+++ b/svx/inc/galleryfilestorage.hxx
@@ -41,7 +41,7 @@ class FmFormModel;
 class GalleryTheme;
 class GalleryThemeEntry;
 
-class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryFileStorage final
+class GalleryFileStorage final
 {
 private:
     tools::SvRef<SotStorage> m_aSvDrawStorageRef;
@@ -58,22 +58,23 @@ private:
 public:
     GalleryFileStorage(const GalleryStorageLocations& rGalleryStorageLocations,
                        GalleryObjectCollection& rGalleryObjectCollection, bool bReadOnly);
-    SAL_DLLPRIVATE ~GalleryFileStorage();
+    ~GalleryFileStorage();
 
     void clearSotStorage();
 
     void setDestDir(const OUString& rDestDir, bool bRelative);
 
-    SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
-    SAL_DLLPRIVATE const tools::SvRef<SotStorage>& GetSvDrawStorage() const;
+    void ImplCreateSvDrawStorage();
+    const tools::SvRef<SotStorage>& GetSvDrawStorage() const;
 
     const INetURLObject& getThemeURL() const { return maGalleryStorageLocations.getThemeURL(); }
 
-    SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme, const GalleryThemeEntry* pThm);
+    bool implWrite(const GalleryTheme& rTheme, const GalleryThemeEntry* pThm);
 
     void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, sal_uInt32 nInsertPos);
     void removeObject(const std::unique_ptr<GalleryObject>& pEntry);
 
+    UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
     std::unique_ptr<SgaObject> implReadSgaObject(GalleryObject const* pEntry);
     bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, GalleryObject* pExistentEntry);
 
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
index 2f5b9f7fcdd2..1a9a645b9faa 100644
--- a/svx/inc/polygn3d.hxx
+++ b/svx/inc/polygn3d.hxx
@@ -23,7 +23,7 @@
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
-class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompoundObject
+class E3dPolygonObj final : public E3dCompoundObject
 {
     // parameters
     basegfx::B3DPolyPolygon aPolyPoly3D;
@@ -31,8 +31,8 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dPolygonObj final : public E3dCompou
     basegfx::B2DPolyPolygon aPolyTexture2D;
     bool bLineOnly;
 
-    SVX_DLLPRIVATE void CreateDefaultNormals();
-    SVX_DLLPRIVATE void CreateDefaultTexture();
+    void CreateDefaultNormals();
+    void CreateDefaultTexture();
 
     virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
 
@@ -44,7 +44,8 @@ public:
     void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
     void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
 
-    E3dPolygonObj(SdrModel& rSdrModel, const basegfx::B3DPolyPolygon& rPolyPoly3D);
+    SVXCORE_DLLPUBLIC E3dPolygonObj(SdrModel& rSdrModel,
+                                    const basegfx::B3DPolyPolygon& rPolyPoly3D);
     E3dPolygonObj(SdrModel& rSdrModel);
     E3dPolygonObj(SdrModel& rSdrModel, E3dPolygonObj const& rSource);