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>

21 files changed, 147 insertions, 157 deletions

diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 201b3129419f..68b9a859b93f 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -76,7 +76,7 @@ namespace connectivity
 
     struct OSQLParseTreeIteratorImpl;
 
-    class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator final
+    class OSQLParseTreeIterator final
     {
     private:
         std::optional<css::sdbc::SQLException>              m_xErrors;          // contains the error while iterating through the statement
@@ -155,29 +155,29 @@ namespace connectivity
         OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) = delete;
 
       public:
-        OSQLParseTreeIterator(
+        OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator(
             const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
             const css::uno::Reference< css::container::XNameAccess >& _rxTables,
             const OSQLParser& _rParser );
-        ~OSQLParseTreeIterator();
+        OOO_DLLPUBLIC_DBTOOLS ~OSQLParseTreeIterator();
 
-        void dispose();
-        bool isCaseSensitive() const;
+        OOO_DLLPUBLIC_DBTOOLS void dispose();
+        OOO_DLLPUBLIC_DBTOOLS bool isCaseSensitive() const;
         // The parse tree to be analysed/traversed:
         // If NULL is passed, the current parse tree will be deleted and the error status cleared.
-        void setParseTree(const OSQLParseNode * pNewParseTree);
+        OOO_DLLPUBLIC_DBTOOLS void setParseTree(const OSQLParseNode * pNewParseTree);
         const OSQLParseNode * getParseTree() const { return m_pParseTree; };
 
         // subtrees in case of a select statement
-        const OSQLParseNode* getWhereTree() const;
-        const OSQLParseNode* getOrderTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getWhereTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getOrderTree() const;
         const OSQLParseNode* getGroupByTree() const;
         const OSQLParseNode* getHavingTree() const;
 
-        const OSQLParseNode* getSimpleWhereTree() const;
-        const OSQLParseNode* getSimpleOrderTree() const;
-        const OSQLParseNode* getSimpleGroupByTree() const;
-        const OSQLParseNode* getSimpleHavingTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleWhereTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleOrderTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleGroupByTree() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLParseNode* getSimpleHavingTree() const;
 
         /** returns the errors which occurred during parsing.
 
@@ -195,10 +195,10 @@ namespace connectivity
             Implemented by calling the single traverse* methods in the proper
             order (depending on the statement type).
         */
-        void traverseAll();
+        OOO_DLLPUBLIC_DBTOOLS void traverseAll();
 
         // The TableRangeMap contains all tables associated with the range name found first.
-        const OSQLTables& getTables() const;
+        OOO_DLLPUBLIC_DBTOOLS const OSQLTables& getTables() const;
 
         const ::rtl::Reference<OSQLColumns>& getSelectColumns() const { return m_aSelectColumns;}
         const ::rtl::Reference<OSQLColumns>& getGroupColumns() const { return m_aGroupColumns;}
@@ -213,7 +213,7 @@ namespace connectivity
             @param  _rTableRange
                 The table range to be set.
         */
-        void getColumnRange(    const OSQLParseNode* _pColumnRef,
+        OOO_DLLPUBLIC_DBTOOLS void getColumnRange( const OSQLParseNode* _pColumnRef,
                                 OUString &_rColumnName,
                                 OUString& _rTableRange) const;
 
@@ -241,7 +241,7 @@ namespace connectivity
             @return
                 The alias name of the column or an empty string.
         */
-        static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
+        OOO_DLLPUBLIC_DBTOOLS static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
 
         /** return the columname and the table range
             @param  _pColumnRef
@@ -253,19 +253,19 @@ namespace connectivity
             @param  _rTableRange
                 The table range to be set.
         */
-        static void getColumnRange( const OSQLParseNode* _pColumnRef,
+        OOO_DLLPUBLIC_DBTOOLS static void getColumnRange( const OSQLParseNode* _pColumnRef,
                                     const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
                                     OUString &_rColumnName,
                                     OUString& _rTableRange);
 
         // return true when the tableNode is a rule like catalog_name, schema_name or table_name
-        static bool isTableNode(const OSQLParseNode* _pTableNode);
+        OOO_DLLPUBLIC_DBTOOLS static bool isTableNode(const OSQLParseNode* _pTableNode);
 
         // tries to find the correct type of the function
         sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
 
         // returns a lis of all joined columns
-        ::std::vector< TNodePair >& getJoinConditions() const;
+        OOO_DLLPUBLIC_DBTOOLS ::std::vector< TNodePair >& getJoinConditions() const;
 
     private:
 
diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx
index 364b91d6c79a..07e4fd25757c 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -55,17 +55,17 @@ namespace dbaui
 
     struct UndoManager_Impl;
     typedef ::cppu::ImplHelper1< css::document::XUndoManager > UndoManager_Base;
-    class DBACCESS_DLLPUBLIC UndoManager final : public UndoManager_Base
+    class UndoManager final : public UndoManager_Base
     {
     public:
-        UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex );
+        DBACCESS_DLLPUBLIC UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex );
         virtual ~UndoManager();
 
-        SfxUndoManager& GetSfxUndoManager() const;
+        DBACCESS_DLLPUBLIC SfxUndoManager& GetSfxUndoManager() const;
 
         // XInterface
-        virtual void SAL_CALL acquire(  ) noexcept override;
-        virtual void SAL_CALL release(  ) noexcept override;
+        DBACCESS_DLLPUBLIC virtual void SAL_CALL acquire(  ) noexcept override;
+        DBACCESS_DLLPUBLIC virtual void SAL_CALL release(  ) noexcept override;
 
         // XComponent equivalents
         void disposing();
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 0bf4196a9800..640415003d15 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -128,7 +128,7 @@ private:
 };
 
 
-class OOX_DLLPUBLIC ChartExport final : public DrawingML {
+class ChartExport final : public DrawingML {
 
 public:
     // first: data sequence for label, second: data sequence for values.
@@ -257,18 +257,18 @@ private:
 
 public:
 
-    ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel,
+    OOX_DLLPUBLIC ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel,
                  ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType );
     virtual ~ChartExport() {}
 
-    void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer);
+    OOX_DLLPUBLIC void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer);
 
     const css::uno::Reference< css::frame::XModel >& getModel() const { return mxChartModel; }
 
-    void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount );
+    OOX_DLLPUBLIC void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount );
     void exportTextProps(const css::uno::Reference< css::beans::XPropertySet >& xPropSet);
 
-    void ExportContent();
+    OOX_DLLPUBLIC void ExportContent();
     void InitRangeSegmentationProperties(
         const css::uno::Reference<
             css::chart2::XChartDocument > & xChartDoc );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 5f7d0565cb50..2ea0fa616dac 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -280,12 +280,12 @@ public:
     void writeSvgExtension(OUString const& rSvgRelId);
 };
 
-class OOX_DLLPUBLIC DrawingML
+class DrawingML
 {
 
 private:
-    static sal_Int32 mnDrawingMLCount;
-    static sal_Int32 mnVmlCount;
+    OOX_DLLPUBLIC static sal_Int32 mnDrawingMLCount;
+    OOX_DLLPUBLIC static sal_Int32 mnVmlCount;
 
     /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC).
     DocumentType meDocumentType;
@@ -300,7 +300,7 @@ protected:
     /// If set, this is the parent of the currently handled shape.
     css::uno::Reference<css::drawing::XShape> m_xParent;
     bool                                      mbIsBackgroundDark;
-    static sal_Int32 mnChartCount;
+    OOX_DLLPUBLIC static sal_Int32 mnChartCount;
 
     /// True when exporting presentation placeholder shape.
     bool mbPlaceholder;
@@ -325,7 +325,7 @@ protected:
         @param eDate LO Date format
         @param eTime LO Time format
     */
-    static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime);
+    OOX_DLLPUBLIC static OUString GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeFormat eTime);
 
     /// Output the media (including copying a video from vnd.sun.star.Package: to the output if necessary).
     void WriteMediaNonVisualProperties(const css::uno::Reference<css::drawing::XShape>& xShape);
@@ -362,7 +362,7 @@ public:
 
     void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; }
     /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
-    OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect);
+    OOX_DLLPUBLIC OUString writeGraphicToStorage(const Graphic &rGraphic , bool bRelPathToMedia = false, GraphicExport::TypeHint eHint = GraphicExport::TypeHint::Detect);
 
     void WriteColor( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
     void WriteColor( const OUString& sColorSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
@@ -379,7 +379,7 @@ public:
     void WriteSolidFill( const OUString& sSchemeName, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
     void WriteSolidFill( const ::Color nColor, const css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
     void WriteSolidFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
-    void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
+    OOX_DLLPUBLIC void WriteGradientFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
 
     /* New API for WriteGradientFill:
        If a BGradient is given, it will be used. Else, the 'Fix' entry will be used for
@@ -395,7 +395,7 @@ public:
 
     void WriteBlipOrNormalFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
                                const OUString& rURLPropName, const css::awt::Size& rSize = {});
-    void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
+    OOX_DLLPUBLIC void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
                        const OUString& sURLPropName, const css::awt::Size& rSize = {});
     void WriteBlipFill(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet,
                        const css::awt::Size& rSize, const OUString& sURLPropName,
@@ -416,7 +416,7 @@ public:
     void WriteSrcRectXGraphic(css::uno::Reference<css::beans::XPropertySet> const & rxPropertySet,
                               css::uno::Reference<css::graphic::XGraphic> const & rxGraphic);
 
-    void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
+    OOX_DLLPUBLIC void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
                               css::uno::Reference< css::frame::XModel> const & xModel = nullptr );
 
     void WriteXGraphicStretch(css::uno::Reference<css::beans::XPropertySet> const & rXPropSet,
@@ -442,7 +442,7 @@ public:
                                css::uno::Reference<css::graphic::XGraphic> const& rxGraphic,
                                css::awt::Size const& rSize);
 
-    void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape,
+    OOX_DLLPUBLIC void WriteShapeTransformation(const css::uno::Reference< css::drawing::XShape >& rXShape,
                   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false, bool bSuppressFlipping = false, bool bFlippedBeforeRotation = false);
     void WriteTransformation(const css::uno::Reference< css::drawing::XShape >& xShape, const tools::Rectangle& rRectangle,
                   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0, bool bIsGroupShape = false);
@@ -472,7 +472,7 @@ public:
                              const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet = {});
 
     void WritePresetShape( const OString& pShape , std::vector< std::pair<sal_Int32,sal_Int32>> & rAvList );
-    void WritePresetShape( const OString& pShape );
+    OOX_DLLPUBLIC void WritePresetShape( const OString& pShape );
     void WritePresetShape( const OString& pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, const css::beans::PropertyValue& rProp );
     bool WriteCustomGeometry(
         const css::uno::Reference<css::drawing::XShape>& rXShape,
@@ -480,19 +480,19 @@ public:
     void WriteEmptyCustomGeometry();
     void WritePolyPolygon(const css::uno::Reference<css::drawing::XShape>& rXShape,
                           const bool bClosed);
-    void WriteFill(const css::uno::Reference<css::beans::XPropertySet>& xPropSet,
+    OOX_DLLPUBLIC void WriteFill(const css::uno::Reference<css::beans::XPropertySet>& xPropSet,
                    const css::awt::Size& rSize = {});
     void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
-    void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
+    OOX_DLLPUBLIC void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
     void WriteShapeEffect( std::u16string_view sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps );
     /** Populates scene3d tag
         @param rXPropSet Prop set
         @param bIsText True if the 3D effects are for a text body, false if it is for a shape
      */
-    void Write3DEffects(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, bool bIsText);
+    OOX_DLLPUBLIC void Write3DEffects(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, bool bIsText);
     void WriteArtisticEffect( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
     OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData );
-    void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId);
+    OOX_DLLPUBLIC void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId);
     void writeDiagramRels(const css::uno::Sequence<css::uno::Sequence<css::uno::Any>>& xRelSeq,
                           const css::uno::Reference<css::io::XOutputStream>& xOutStream,
                           std::u16string_view sGrabBagProperyName, int nDiagramId);
@@ -502,7 +502,7 @@ public:
     static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape );
     sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, std::u16string_view propName);
 
-    static void ResetMlCounters();
+    OOX_DLLPUBLIC static void ResetMlCounters();
 
     static sal_Int32 getNewDrawingUniqueId() { return ++mnDrawingMLCount; }
     static sal_Int32 getNewVMLUniqueId() { return ++mnVmlCount; }
@@ -525,7 +525,7 @@ public:
                                         const OUString& sRelationshipType,
                                         OUString* pRelationshipId );
 
-    std::shared_ptr<GraphicExport> createGraphicExport();
+    OOX_DLLPUBLIC std::shared_ptr<GraphicExport> createGraphicExport();
 };
 
 }
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index f8e4d662cf7a..6bcafdbca9eb 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -26,7 +26,7 @@
 #include <vcl/weld.hxx>
 #include <deque>
 
-class SFX2_DLLPUBLIC SvxCharView final : public weld::CustomWidgetController
+class SAL_DLLPUBLIC_RTTI SvxCharView final : public weld::CustomWidgetController
 {
 private:
     VclPtr<VirtualDevice> mxVirDev;
@@ -52,6 +52,7 @@ private:
     bool GetDecimalValueAndCharName(sal_UCS4& rDecimalValue, OUString& rCharName);
 public:
     SvxCharView(const VclPtr<VirtualDevice>& rVirDev);
+    SFX2_DLLPUBLIC virtual ~SvxCharView() override;
 
     void            SetFont( const vcl::Font& rFont );
     vcl::Font const & GetFont() const { return maFont; }
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 72003f08fd49..519b7f701309 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -236,15 +236,15 @@ namespace ucbhelper
 
 class UCBStorage_Impl;
 struct UCBStorageElement_Impl;
-class SOT_DLLPUBLIC UCBStorage final : public BaseStorage
+class UCBStorage final : public BaseStorage
 {
     UCBStorage_Impl*            pImp;
 
                                 virtual ~UCBStorage() override;
 public:
-    static bool                 IsStorageFile( SvStream* );
+    SOT_DLLPUBLIC static bool   IsStorageFile( SvStream* );
 
-                                UCBStorage( const ::ucbhelper::Content& rContent,
+    SOT_DLLPUBLIC               UCBStorage( const ::ucbhelper::Content& rContent,
                                             const OUString& rName,
                                             StreamMode nMode,
                                             bool bDirect,
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 49459f559acb..3bfae4878359 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -37,7 +37,7 @@ namespace com::sun::star::uno {
 
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
-class UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener final : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
+class OpenFileDropTargetListener final : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
 {
     private:
         /// uno service manager to create necessary services
@@ -50,7 +50,7 @@ class UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener final : public
         DataFlavorExVector m_aFormats;
 
     public:
-        OpenFileDropTargetListener( css::uno::Reference< css::uno::XComponentContext > xContext,
+        UNLESS_MERGELIBS(SVT_DLLPUBLIC) OpenFileDropTargetListener( css::uno::Reference< css::uno::XComponentContext > xContext,
                                     const css::uno::Reference< css::frame::XFrame >& xFrame );
         virtual ~OpenFileDropTargetListener() override;
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 1c440b6ee2c1..4035f82d4c3d 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -52,19 +52,19 @@ namespace svx
     class SvxShowCharSetAcc;
 }
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxShowCharSet : public weld::CustomWidgetController
+class SAL_WARN_UNUSED SvxShowCharSet : public weld::CustomWidgetController
 {
 protected:
     VclPtr<VirtualDevice> mxVirDev;
     vcl::Font maFont;
     std::unique_ptr<weld::ScrolledWindow> mxScrollArea;
 public:
-    SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev);
+    SVX_DLLPUBLIC SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev);
     virtual ~SvxShowCharSet() override;
 
     virtual void            RecalculateFont(vcl::RenderContext& rRenderContext);
 
-    void                    SelectCharacter( sal_UCS4 cNew );
+    SVX_DLLPUBLIC void      SelectCharacter( sal_UCS4 cNew );
     virtual sal_UCS4        GetSelectCharacter() const;
     virtual sal_UCS4        GetCharFromIndex(int index) const;
     void                    createContextMenu(const Point& rPosition);
@@ -76,9 +76,9 @@ public:
     void            SetPreSelectHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aPreSelectHdl = rHdl; }
     void            SetFavClickHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aFavClickHdl = rHdl; }
     static sal_uInt32& getSelectedChar();
-    void            SetFont( const vcl::Font& rFont );
+    SVX_DLLPUBLIC void SetFont( const vcl::Font& rFont );
     vcl::Font const & GetFont() const { return maFont; }
-    FontCharMapRef const & GetFontCharMap();
+    SVX_DLLPUBLIC FontCharMapRef const & GetFontCharMap();
     bool            isFavChar(std::u16string_view sTitle, std::u16string_view rFont);
     void            getFavCharacterList(); //gets both Fav char and Fav char font list
     void            updateFavCharacterList(const OUString& rChar, const OUString& rFont);
@@ -153,7 +153,7 @@ protected:
     void            InitSettings(vcl::RenderContext& rRenderContext);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
-    DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void);
+    DECL_LINK(VscrollHdl, weld::ScrolledWindow&, void);
     void ContextMenuSelect(std::u16string_view rIdent);
 
     void            init();
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index b984a74c65d9..7fff9931f642 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -44,7 +44,7 @@ class E3dDefaultAttributes;
 |*
 \************************************************************************/
 
-class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject
+class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject
 {
     // Parameter
     basegfx::B3DPoint                   aCubePos;
@@ -61,7 +61,7 @@ private:
     virtual ~E3dCubeObj() override;
 
 public:
-    E3dCubeObj(SdrModel& rSdrModel,
+    SVXCORE_DLLPUBLIC E3dCubeObj(SdrModel& rSdrModel,
         const E3dDefaultAttributes& rDefault,
         const basegfx::B3DPoint& aPos,
         const basegfx::B3DVector& r3DSize);
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 10f5b26fecac..281fadbc18c3 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -43,7 +43,7 @@ public:
 
 class SvxGraphCtrlAccessibleContext;
 
-class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
+class GraphCtrl : public weld::CustomWidgetController
 {
     friend class GraphCtrlView;
     friend class GraphCtrlUserCall;
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
     bool                mbInIdleUpdate;
     weld::Dialog*       mpDialog;
 
-                        DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void );
+    DECL_LINK( UpdateHdl, Timer*, void );
 
     rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
 
@@ -93,11 +93,11 @@ protected:
 
 public:
 
-    GraphCtrl(weld::Dialog* pDialog);
+    SVX_DLLPUBLIC GraphCtrl(weld::Dialog* pDialog);
     virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
-    virtual ~GraphCtrl() override;
+    SVX_DLLPUBLIC virtual ~GraphCtrl() override;
 
-    void                SetGraphic( const Graphic& rGraphic, bool bNewModel = true );
+    SVX_DLLPUBLIC void  SetGraphic( const Graphic& rGraphic, bool bNewModel = true );
     const Graphic&      GetGraphic() const { return aGraphic; }
     const Size&         GetGraphicSize() const { return aGraphSize; }
 
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 9bd17307ceee..c21be66cdc5e 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -39,7 +39,7 @@ class E3dDefaultAttributes;
 |*
 \************************************************************************/
 
-class SVXCORE_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject
+class E3dLatheObj final : public E3dCompoundObject
 {
     basegfx::B2DPolyPolygon maPolyPoly2D;
 
@@ -52,7 +52,7 @@ private:
     virtual ~E3dLatheObj() override;
 
 public:
-    E3dLatheObj(
+    SVXCORE_DLLPUBLIC E3dLatheObj(
         SdrModel& rSdrModel,
         const E3dDefaultAttributes& rDefault,
         basegfx::B2DPolyPolygon aPoly2D);
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index 3e0ff95bba4e..1f15d685cfdf 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -32,7 +32,7 @@ class E3dDefaultAttributes;
  * SphereObject with diameter r3DSize.
  * The count of planes depends on the horizontal and vertical segment count.
  */
-class SVXCORE_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject
+class E3dSphereObj final : public E3dCompoundObject
 {
 private:
     basegfx::B3DPoint               aCenter;
@@ -47,7 +47,7 @@ private:
     virtual ~E3dSphereObj() override;
 
 public:
-    E3dSphereObj(
+    SVXCORE_DLLPUBLIC E3dSphereObj(
         SdrModel& rSdrModel,
         const E3dDefaultAttributes& rDefault,
         const basegfx::B3DPoint& rCenter,
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index b6d333374a3f..58071ad6fff1 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -535,25 +535,25 @@ protected:
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
 
-class TOOLKIT_DLLPUBLIC SVTXNumericField final : public cppu::ImplInheritanceHelper<SVTXFormattedField, css::awt::XNumericField>
+class SVTXNumericField final : public cppu::ImplInheritanceHelper<SVTXFormattedField, css::awt::XNumericField>
 {
 public:
                     SVTXNumericField();
                     virtual ~SVTXNumericField() override;
 
     // css::awt::XNumericField
-    void SAL_CALL setValue( double Value ) override;
-    double SAL_CALL getValue(  ) override;
+    TOOLKIT_DLLPUBLIC void SAL_CALL setValue( double Value ) override;
+    TOOLKIT_DLLPUBLIC double SAL_CALL getValue(  ) override;
     void SAL_CALL setMin( double Value ) override;
-    double SAL_CALL getMin(  ) override;
+    TOOLKIT_DLLPUBLIC double SAL_CALL getMin(  ) override;
     void SAL_CALL setMax( double Value ) override;
-    double SAL_CALL getMax(  ) override;
+    TOOLKIT_DLLPUBLIC double SAL_CALL getMax(  ) override;
     void SAL_CALL setFirst( double Value ) override;
     double SAL_CALL getFirst(  ) override;
     void SAL_CALL setLast( double Value ) override;
     double SAL_CALL getLast(  ) override;
     void SAL_CALL setSpinSize( double Value ) override;
-    double SAL_CALL getSpinSize(  ) override;
+    TOOLKIT_DLLPUBLIC double SAL_CALL getSpinSize(  ) override;
     void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
     sal_Int16 SAL_CALL getDecimalDigits(  ) override;
     void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 2f6752e0848a..048c7cce27cd 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -30,7 +30,7 @@
 #include <tools/toolsdllapi.h>
 
 /// Transformation sets for 3D output
-class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dTransformationSet
+class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI B3dTransformationSet
 {
 private:
     // Object Matrix Object -> World
@@ -106,16 +106,16 @@ public:
 
     // aspect ratio accessors and the defined method of keeping defined aspect ratio
     double GetRatio() const { return mfRatio; }
-    void SetRatio(double fNew);
+    TOOLS_DLLPUBLIC void SetRatio(double fNew);
 
     // Parameters of ViewportTransformation
-    void SetDeviceRectangle(double fL=-1.0, double fR=1.0,
+    TOOLS_DLLPUBLIC void SetDeviceRectangle(double fL=-1.0, double fR=1.0,
                             double fB=-1.0, double fT=1.0);
     double GetDeviceRectangleWidth() const { return mfRightBound - mfLeftBound; }
 
-    void SetPerspective(bool bNew);
+    TOOLS_DLLPUBLIC void SetPerspective(bool bNew);
 
-    void SetViewportRectangle(tools::Rectangle const & rRect, tools::Rectangle const & rVisible);
+    TOOLS_DLLPUBLIC void SetViewportRectangle(tools::Rectangle const & rRect, tools::Rectangle const & rVisible);
     void SetViewportRectangle(tools::Rectangle const & rRect) { SetViewportRectangle(rRect, rRect); }
 
     void CalcViewport();
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index ea088e910694..00a7ec00158b 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -54,7 +54,7 @@ class PropertyValues;
   * values to return can easily appended to a valueset object. That object can
   * directly be returned by the implementation of the command.
   */
-class UCBHELPER_DLLPUBLIC PropertyValueSet final :
+class PropertyValueSet final :
                 public cppu::WeakImplHelper<
                     css::sdbc::XRow,
                     css::sdbc::XColumnLocate>
@@ -67,7 +67,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet final :
     bool        m_bTriedToGetTypeConverter;
 
 private:
-    UCBHELPER_DLLPRIVATE const css::uno::Reference< css::script::XTypeConverter >&
+    const css::uno::Reference< css::script::XTypeConverter >&
     getTypeConverter();
 
     template <class T, T ucbhelper_impl::PropertyValue::*_member_name_>
@@ -77,7 +77,7 @@ private:
     void appendValue(const OUString& rPropName, PropsSet nTypeName, const T& rValue);
 
 public:
-    PropertyValueSet(
+    UCBHELPER_DLLPUBLIC PropertyValueSet(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~PropertyValueSet() override;
 
@@ -138,37 +138,37 @@ public:
 
     // Non-interface methods
 
-    void appendString( const OUString& rPropName, const OUString& rValue );
+    UCBHELPER_DLLPUBLIC void appendString( const OUString& rPropName, const OUString& rValue );
     void appendString( const css::beans::Property& rProp, const OUString& rValue )
     {
         appendString( rProp.Name, rValue );
     }
 
-    void appendBoolean( const OUString& rPropName, bool bValue );
+    UCBHELPER_DLLPUBLIC void appendBoolean( const OUString& rPropName, bool bValue );
     void appendBoolean( const css::beans::Property& rProp, bool bValue )
     {
         appendBoolean( rProp.Name, bValue );
     }
 
-    void appendLong( const OUString& rPropName, sal_Int64 nValue );
+    UCBHELPER_DLLPUBLIC void appendLong( const OUString& rPropName, sal_Int64 nValue );
     void appendLong( const css::beans::Property& rProp, sal_Int64 nValue )
     {
         appendLong( rProp.Name, nValue );
     }
 
-    void appendTimestamp( const OUString& rPropName, const css::util::DateTime& rValue );
+    UCBHELPER_DLLPUBLIC void appendTimestamp( const OUString& rPropName, const css::util::DateTime& rValue );
     void appendTimestamp( const css::beans::Property& rProp, const css::util::DateTime& rValue )
     {
         appendTimestamp( rProp.Name, rValue );
     }
 
-    void appendObject( const OUString& rPropName, const css::uno::Any& rValue );
+    UCBHELPER_DLLPUBLIC void appendObject( const OUString& rPropName, const css::uno::Any& rValue );
     void appendObject( const css::beans::Property& rProp, const css::uno::Any& rValue )
     {
         appendObject( rProp.Name, rValue );
     }
 
-    void appendVoid( const OUString& rPropName );
+    UCBHELPER_DLLPUBLIC void appendVoid( const OUString& rPropName );
     void appendVoid( const css::beans::Property& rProp )
     {
         appendVoid( rProp.Name );
@@ -180,7 +180,7 @@ public:
       *
        *    @param  rSet is a property set containing the property values.
       */
-    void appendPropertySet( const css::uno::Reference< css::beans::XPropertySet >& rSet );
+    UCBHELPER_DLLPUBLIC void appendPropertySet( const css::uno::Reference< css::beans::XPropertySet >& rSet );
 
     /** This method tries to append a single property value contained in a
       * property set to the value set.
@@ -191,7 +191,7 @@ public:
        *    @return False, if the property value cannot be obtained from the
       *         given property pet. True, otherwise.
        */
-    bool appendPropertySetValue(
+    UCBHELPER_DLLPUBLIC bool appendPropertySetValue(
                         const css::uno::Reference< css::beans::XPropertySet >& rSet,
                         const css::beans::Property& rProperty );
 };
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 779b5ab1df32..5e9bad0ce499 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -56,7 +56,7 @@ struct ResultSet_Impl;
  *
  * @see ResultSetDataSupplier
  */
-class UCBHELPER_DLLPUBLIC ResultSet final :
+class ResultSet final :
                 public cppu::WeakImplHelper<
                     css::lang::XServiceInfo,
                     css::lang::XComponent,
@@ -78,7 +78,7 @@ public:
       *        shall be able to obtain the values.
       * @param rDataSupplier is a supplier for the resultset data.
       */
-    ResultSet(
+    UCBHELPER_DLLPUBLIC ResultSet(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const css::uno::Sequence< css::beans::Property >& rProperties,
             const rtl::Reference< ResultSetDataSupplier >& rDataSupplier );
@@ -92,7 +92,7 @@ public:
       * @param rxEnv is the environment for interactions, progress propagation,
       *        ...
       */
-    ResultSet(
+    UCBHELPER_DLLPUBLIC ResultSet(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const css::uno::Sequence< css::beans::Property >& rProperties,
             const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
@@ -253,13 +253,13 @@ public:
       * @param nOld is the old count of rows; must be non-negative.
       * @param nnew is the new count of rows; must be non-negative.
       */
-    void rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew );
+    UCBHELPER_DLLPUBLIC void rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew );
 
     /**
       * This method should be called by the data supplier for the result set
       * to indicate that there were all rows obtained from the data source.
       */
-    void rowCountFinal();
+    UCBHELPER_DLLPUBLIC void rowCountFinal();
 
     /**
       * This method returns a sequence containing all properties ( not the
@@ -267,7 +267,7 @@ public:
       *
       * @return a sequence of properties.
       */
-    const css::uno::Sequence< css::beans::Property >&
+    UCBHELPER_DLLPUBLIC const css::uno::Sequence< css::beans::Property >&
     getProperties() const;
 
     /**
@@ -276,7 +276,7 @@ public:
       *
       * @return an environment or an empty reference.
       */
-    const css::uno::Reference< css::ucb::XCommandEnvironment >&
+    UCBHELPER_DLLPUBLIC const css::uno::Reference< css::ucb::XCommandEnvironment >&
     getEnvironment() const;
 };
 
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 856c28a0a873..de3a09bdd6c4 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -69,7 +69,7 @@ ResultSetColumnData::ResultSetColumnData()
  * css::sdbc::XResultSetMetaDataSupplier, which is required for
  * implementations of service com.sun.star.ucb.ContentResultSet.
  */
-class UCBHELPER_DLLPUBLIC ResultSetMetaData final :
+class ResultSetMetaData final :
                 public cppu::WeakImplHelper<css::sdbc::XResultSetMetaData>
 {
     std::unique_ptr<ucbhelper_impl::ResultSetMetaData_Impl> m_pImpl;
@@ -85,7 +85,7 @@ public:
       * @param rProps is a sequence of properties (partially) describing the
       *        columns of a resultset.
       */
-    ResultSetMetaData(
+    UCBHELPER_DLLPUBLIC ResultSetMetaData(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const css::uno::Sequence< css::beans::Property >& rProps );
 
@@ -102,7 +102,7 @@ public:
       *        rColumnData[ 0 ] corresponds to data in rProps[ 0 ],
       *        rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ...
       */
-    ResultSetMetaData(
+    UCBHELPER_DLLPUBLIC ResultSetMetaData(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
             const css::uno::Sequence< css::beans::Property >& rProps,
             std::vector< ResultSetColumnData >&& rColumnData );
diff --git a/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx b/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx
index 00c9c383929a..c2bb476aebd6 100644
--- a/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx
+++ b/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx
@@ -48,20 +48,9 @@ template <> struct o3tl::typed_flags<IA2AttributeType> : is_typed_flags<IA2Attri
 {
 };
 
-class VCL_DLLPUBLIC AccessibleTextAttributeHelper
+namespace AccessibleTextAttributeHelper
 {
-public:
-    /** Converts UNO text attribute properties to a string holding
-     *  the corresponding IAccessible2 text attributes.
-     * @param rUnoAttributes A sequence holding the UNO text attributes.
-     * @param eAttributeType: The type(s) of attributes of interest.
-     * @returns String holding the corresponding IAccessible2 text properties.
-     */
-    static OUString ConvertUnoToIAccessible2TextAttributes(
-        const css::uno::Sequence<css::beans::PropertyValue>& rUnoAttributes,
-        IA2AttributeType eAttributeType);
-
-    /**
+/**
      * Get the IAccessible2 text attributes and the span of the attributes at the given index.
      * @param xText The interface to query for the information.
      * @param eAttributeType: The type(s) of attributes of interest.
@@ -70,10 +59,10 @@ public:
      * @param rEndOffset Out param that is set to the end index of the attribute run.
      * @return IAccessible2 text attributes at the given character offset.
      */
-    static OUString
-    GetIAccessible2TextAttributes(css::uno::Reference<css::accessibility::XAccessibleText> xText,
-                                  IA2AttributeType eAttributeType, sal_Int32 nOffset,
-                                  sal_Int32& rStartOffset, sal_Int32& rEndOffset);
+OUString VCL_DLLPUBLIC
+GetIAccessible2TextAttributes(const css::uno::Reference<css::accessibility::XAccessibleText>& xText,
+                              IA2AttributeType eAttributeType, sal_Int32 nOffset,
+                              sal_Int32& rStartOffset, sal_Int32& rEndOffset);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index f8b691946da8..c879d6c97fba 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -409,24 +409,24 @@ private:
 namespace BuilderUtils
 {
     //apply the properties of rProps to pWindow
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps);
+    void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps);
 
     //Convert _ gtk markup to ~ vcl markup
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString convertMnemonicMarkup(std::u16string_view rIn);
+    OUString convertMnemonicMarkup(std::u16string_view rIn);
 
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString extractCustomProperty(VclBuilder::stringmap &rMap);
+    OUString extractCustomProperty(VclBuilder::stringmap &rMap);
 
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) bool extractDropdown(VclBuilder::stringmap &rMap);
+    bool extractDropdown(VclBuilder::stringmap &rMap);
 
     //add a default value of 25 width-chars to a map if width-chars not set
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) void ensureDefaultWidthChars(VclBuilder::stringmap &rMap);
+    void ensureDefaultWidthChars(VclBuilder::stringmap &rMap);
 
     //Helpers to retrofit all the existing code to the builder
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
+    void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox);
+    void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition);
 
     //Convert an accessibility role name to accessibility role number
-    UNLESS_MERGELIBS(VCL_DLLPUBLIC) sal_Int16 getRoleFromName(const OUString& roleName);
+    sal_Int16 getRoleFromName(const OUString& roleName);
 }
 
 template <typename T>
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 5587dd2c9da2..f4599154e465 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -78,7 +78,7 @@ class VCL_DLLPUBLIC PDFOutputStream
     virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0;
 };
 
-class VCL_DLLPUBLIC PDFWriter
+class PDFWriter
 {
     ScopedVclPtr<PDFWriterImpl> xImplementation;
 
@@ -688,8 +688,8 @@ The following structure describes the permissions used in PDF security
         {}
     };
 
-    PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& );
-    ~PDFWriter();
+    VCL_DLLPUBLIC PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& );
+    VCL_DLLPUBLIC ~PDFWriter();
 
     /** Returns an OutputDevice for formatting
         This Output device is guaranteed to use the same
@@ -698,7 +698,7 @@ The following structure describes the permissions used in PDF security
         @returns
         the reference output device
     */
-    OutputDevice* GetReferenceDevice();
+    VCL_DLLPUBLIC OutputDevice* GetReferenceDevice();
 
     /** Creates a new page to fill
         If width and height are not set the page size
@@ -708,7 +708,7 @@ The following structure describes the permissions used in PDF security
         Colors and other state information MUST
         be set again or are undefined.
     */
-    void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit );
+    VCL_DLLPUBLIC void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit );
     /** Play a metafile like an outputdevice would do
     */
     struct PlayMetafileContext
@@ -726,36 +726,36 @@ The following structure describes the permissions used in PDF security
         {}
 
     };
-    void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr );
+    VCL_DLLPUBLIC void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr );
 
     /* sets the document locale originally passed with the context to a new value
      * only affects the output if used before calling Emit.
      */
-    void SetDocumentLocale( const css::lang::Locale& rDocLocale );
+    VCL_DLLPUBLIC void SetDocumentLocale( const css::lang::Locale& rDocLocale );
 
     /* finishes the file */
-    bool Emit();
+    VCL_DLLPUBLIC bool Emit();
 
     /*
      * Get a list of errors that occurred during processing
      * this should enable the producer to give feedback about
      * any anomalies that might have occurred
      */
-    std::set< ErrorCode > const & GetErrors() const;
+    VCL_DLLPUBLIC std::set< ErrorCode > const & GetErrors() const;
 
     // uses 128bit encryption
-    static css::uno::Reference< css::beans::XMaterialHolder >
+    VCL_DLLPUBLIC static css::uno::Reference< css::beans::XMaterialHolder >
            InitEncryption( const OUString& i_rOwnerPassword,
                            const OUString& i_rUserPassword
                          );
 
     /* functions for graphics state */
     /* flag values: see vcl/outdev.hxx */
-    void                Push( PushFlags nFlags = PushFlags::ALL );
-    void                Pop();
+    VCL_DLLPUBLIC void Push( PushFlags nFlags = PushFlags::ALL );
+    VCL_DLLPUBLIC void Pop();
 
-    void               SetClipRegion();
-    void               SetClipRegion( const basegfx::B2DPolyPolygon& rRegion );
+    VCL_DLLPUBLIC void SetClipRegion();
+    VCL_DLLPUBLIC void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion );
     void               MoveClipRegion( tools::Long nHorzMove, tools::Long nVertMove );
     void               IntersectClipRegion( const tools::Rectangle& rRect );
     void               IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion );
@@ -769,8 +769,8 @@ The following structure describes the permissions used in PDF security
     void               SetFillColor( const Color& rColor );
     void               SetFillColor() { SetFillColor( COL_TRANSPARENT ); }
 
-    void               SetFont( const vcl::Font& rNewFont );
-    void               SetTextColor( const Color& rColor );
+    VCL_DLLPUBLIC void SetFont( const vcl::Font& rNewFont );
+    VCL_DLLPUBLIC void SetTextColor( const Color& rColor );
     void               SetTextFillColor();
     void               SetTextFillColor( const Color& rColor );
 
@@ -780,11 +780,11 @@ The following structure describes the permissions used in PDF security
     void               SetOverlineColor( const Color& rColor );
     void               SetTextAlign( ::TextAlign eAlign );
 
-    void               SetMapMode( const MapMode& rNewMapMode );
+    VCL_DLLPUBLIC void SetMapMode( const MapMode& rNewMapMode );
 
 
     /* actual drawing functions */
-    void                DrawText( const Point& rPos, const OUString& rText );
+    VCL_DLLPUBLIC void  DrawText( const Point& rPos, const OUString& rText );
 
     void                DrawTextLine( const Point& rPos, tools::Long nWidth,
                                       FontStrikeout eStrikeout,
@@ -798,7 +798,7 @@ The following structure describes the permissions used in PDF security
     void                DrawStretchText( const Point& rStartPt, sal_Int32 nWidth,
                                          const OUString& rStr,
                                          sal_Int32 nIndex, sal_Int32 nLen );
-    void                DrawText( const tools::Rectangle& rRect,
+    VCL_DLLPUBLIC void  DrawText( const tools::Rectangle& rRect,
                                   const OUString& rStr, DrawTextFlags nStyle );
 
     void                DrawPixel( const Point& rPt, const Color& rColor );
@@ -808,7 +808,7 @@ The following structure describes the permissions used in PDF security
     void                DrawLine( const Point& rStartPt, const Point& rEndPt );
     void                DrawLine( const Point& rStartPt, const Point& rEndPt,
                                   const LineInfo& rLineInfo );
-    void                DrawPolyLine( const tools::Polygon& rPoly );
+    VCL_DLLPUBLIC void  DrawPolyLine( const tools::Polygon& rPoly );
     void                DrawPolyLine( const tools::Polygon& rPoly,
                                       const LineInfo& rLineInfo );
     void                DrawPolyLine( const tools::Polygon& rPoly, const ExtLineInfo& rInfo );
@@ -858,7 +858,7 @@ The following structure describes the permissions used in PDF security
     will be ignored if the produced PDF has a lower version. The drawing
     operations will be emitted normally.
     */
-    void                BeginTransparencyGroup();
+    VCL_DLLPUBLIC void BeginTransparencyGroup();
 
     /** End a transparency group with constant transparency factor
 
@@ -871,7 +871,7 @@ The following structure describes the permissions used in PDF security
     @param nTransparencePercent
     The transparency factor
     */
-    void                EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent );
+    VCL_DLLPUBLIC void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent );
 
     /** Insert a JPG encoded image (optionally with mask)
 
@@ -1109,9 +1109,9 @@ The following structure describes the permissions used in PDF security
     @returns
     the new structure element's id for use in SetCurrentStructureElement
      */
-    void BeginStructureElement(sal_Int32 id);
-    sal_Int32 EnsureStructureElement();
-    void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias);
+    VCL_DLLPUBLIC void BeginStructureElement(sal_Int32 id);
+    VCL_DLLPUBLIC sal_Int32 EnsureStructureElement();
+    VCL_DLLPUBLIC void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias);
 
     /** end the current logical structure element
 
@@ -1120,7 +1120,7 @@ The following structure describes the permissions used in PDF security
 
     @see BeginStructureElement
      */
-    void EndStructureElement();
+    VCL_DLLPUBLIC void EndStructureElement();
     /** set the current structure element
 
     For different purposes it may be useful to paint a structure element's
@@ -1148,7 +1148,7 @@ The following structure describes the permissions used in PDF security
     @param eVal
     the value to set the attribute to
      */
-    void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal );
+    VCL_DLLPUBLIC void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal );
     /** set a structure attribute on the current structural element
 
     SetStructureAttributeNumerical sets an attribute of the current structural element
@@ -1249,7 +1249,7 @@ The following structure describes the permissions used in PDF security
     @param pStream
     the interface to the additional stream
     */
-    void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream);
+    VCL_DLLPUBLIC void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream);
 
     /// Write rString as a PDF hex string into rBuffer.
     static void AppendUnicodeTextString(const OUString& rString, OStringBuffer& rBuffer);
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 332005e720ac..4fc12c650621 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -34,7 +34,7 @@ namespace comphelper
 
 typedef ::std::map< OUString, css::uno::Reference< css::uno::XInterface > > IdMap_t;
 
-class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
+class UnoInterfaceToUniqueIdentifierMapper
 {
     typedef std::deque< OUString > Reserved_t;
 
@@ -44,7 +44,7 @@ public:
     /** returns a unique identifier for the given uno object. If a UNO object is
         registered more than once, the returned identifier is always the same.
     */
-    const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface );
+    XMLOFF_DLLPUBLIC const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface );
 
     /** registers the given uno object with the given identifier.
 
@@ -68,7 +68,7 @@ public:
             the identifier for the given uno object. If this uno object is not already
             registered, an empty string is returned
     */
-    const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const;
+    XMLOFF_DLLPUBLIC const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const;
 
     /** @returns
         the uno object that is registered with the given identifier. If no uno object