make some classes module-private

improve the script, but it still generates some false positives

Change-Id: If8ee1cba8c04ac0be11f73220149e6de15f24f44
Reviewed-on: https://gerrit.libreoffice.org/81929
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

38 files changed, 100 insertions, 71 deletions

diff --git a/bin/find-can-be-private-symbols.py b/bin/find-can-be-private-symbols.py
index baaba9e924ff..0ff17072361a 100755
--- a/bin/find-can-be-private-symbols.py
+++ b/bin/find-can-be-private-symbols.py
@@ -1,10 +1,20 @@
 #!/usr/bin/python
 #
-# Find exported symbols that can be made private.
+# Find exported symbols that can be made non-exported.
 #
 # Noting that (a) parsing these commands is a pain, the output is quite irregular and (b) I'm fumbling in the
 # dark here, trying to guess what exactly constitutes an "import" vs an "export" of a symbol, linux linking
 # is rather complex.
+#
+# Takes about 5min to run on a decent machine.
+#
+# The standalone function analysis is reasonable reliable, but the class/method analysis is less so
+#   (something to do with destructor thunks not showing up in my results?)
+#
+# Also, the class/method analysis will not catch problems like
+#    'dynamic_cast from 'Foo' with hidden type visibility to 'Bar' with default type visibility'
+#    but loplugin:dyncastvisibility will do that for you
+#
 
 import subprocess
 import sys
@@ -74,20 +84,28 @@ classes_with_imported_symbols = set()
 for sym in exported_symbols:
     filtered_sym = subprocess.check_output(["c++filt", sym]).strip()
     if filtered_sym.startswith("non-virtual thunk to "): filtered_sym = filtered_sym[21:]
+    elif filtered_sym.startswith("virtual thunk to "): filtered_sym = filtered_sym[17:]
     i = filtered_sym.find("(")
     i = filtered_sym.rfind("::", 0, i)
     if i != -1:
         classname = filtered_sym[:i]
-        func = filtered_sym[i+2:]
         # find classes where all of the exported symbols are not imported
         classes_with_exported_symbols.add(classname)
-        if sym in imported_symbols: classes_with_imported_symbols.add(classname)
     else:
-        package = ""
         func = filtered_sym
         # find standalone functions which are exported but not imported
         if not(sym in imported_symbols): unused_function_exports.add(func)
 
+for sym in imported_symbols:
+    filtered_sym = subprocess.check_output(["c++filt", sym]).strip()
+    if filtered_sym.startswith("non-virtual thunk to "): filtered_sym = filtered_sym[21:]
+    elif filtered_sym.startswith("virtual thunk to "): filtered_sym = filtered_sym[17:]
+    i = filtered_sym.find("(")
+    i = filtered_sym.rfind("::", 0, i)
+    if i != -1:
+        classname = filtered_sym[:i]
+        classes_with_imported_symbols.add(classname)
+
 with open("bin/find-can-be-private-symbols.functions.results", "wt") as f:
     for sym in sorted(unused_function_exports):
         # Filter out most of the noise.
@@ -175,4 +193,16 @@ with open("bin/find-can-be-private-symbols.functions.results", "wt") as f:
 
 with open("bin/find-can-be-private-symbols.classes.results", "wt") as f:
     for sym in sorted(classes_with_exported_symbols - classes_with_imported_symbols):
+        # externals
+        if sym.startswith("libcdr"): continue
+        elif sym.startswith("libabw"): continue
+        elif sym.startswith("libebook"): continue
+        elif sym.startswith("libepubgen"): continue
+        elif sym.startswith("libfreehand"): continue
+        elif sym.startswith("libmspub"): continue
+        elif sym.startswith("libpagemaker"): continue
+        elif sym.startswith("libqxp"): continue
+        elif sym.startswith("libvisio"): continue
+        elif sym.startswith("libzmf"): continue
+        elif sym.startswith("lucene::"): continue
         f.write(sym + "\n")
diff --git a/helpcompiler/inc/BasCodeTagger.hxx b/helpcompiler/inc/BasCodeTagger.hxx
index 93dfd70f137b..d897afb4fe1d 100644
--- a/helpcompiler/inc/BasCodeTagger.hxx
+++ b/helpcompiler/inc/BasCodeTagger.hxx
@@ -20,7 +20,7 @@
 class LibXmlTreeWalker;
 
 //!Tagger class.
-class L10N_DLLPUBLIC BasicCodeTagger
+class BasicCodeTagger
 {
   private:
     xmlDocPtr             m_pDocument;
@@ -42,7 +42,7 @@ class L10N_DLLPUBLIC BasicCodeTagger
 
 //================LibXmlTreeWalker===========================================================
 
-class L10N_DLLPUBLIC LibXmlTreeWalker
+class LibXmlTreeWalker
 {
   private:
     xmlNodePtr            m_pCurrentNode;
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 95e5a7c11d22..64e4ac597df7 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -49,7 +49,7 @@ enum class BasicErrorReason
     STDLIB           = 0x0100
 };
 
-class BASIC_DLLPUBLIC BasicError
+class BasicError
 {
 private:
     ErrCode nErrorId;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 981ab4dd49db..4defc7f0b8bb 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -130,7 +130,7 @@ struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById
     bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs,
                     std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
 };
-struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoByTxBxComp
+struct CompareSvxMSDffShapeInfoByTxBxComp
 {
     bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs,
                     std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
diff --git a/include/opencl/platforminfo.hxx b/include/opencl/platforminfo.hxx
index ac3f144f9d9f..5e54c052fc51 100644
--- a/include/opencl/platforminfo.hxx
+++ b/include/opencl/platforminfo.hxx
@@ -20,7 +20,7 @@
 
 // Struct that describs an actual instance of an OpenCL device
 
-struct OPENCL_DLLPUBLIC OpenCLDeviceInfo
+struct OpenCLDeviceInfo
 {
     cl_device_id device;
     OUString maName;
@@ -35,7 +35,7 @@ struct OPENCL_DLLPUBLIC OpenCLDeviceInfo
 
 // Struct that describs an actual instance of an OpenCL platform implementation
 
-struct OPENCL_DLLPUBLIC OpenCLPlatformInfo
+struct OpenCLPlatformInfo
 {
     cl_platform_id platform;
     OUString maVendor;
diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
index 68d7b4ef252d..440148beff0d 100644
--- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
+++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
@@ -18,7 +18,7 @@ namespace com { namespace sun { namespace star { namespace ui {
 } } } }
 namespace com::sun::star::uno { class XComponentContext; }
 
-class SFX2_DLLPUBLIC NotebookbarTabControl final : public NotebookbarTabControlBase
+class NotebookbarTabControl final : public NotebookbarTabControlBase
 {
 friend class ChangedUIEventListener;
 
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index fbde3fc5dacc..1805778aa3d2 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -356,7 +356,7 @@ private:
     FontNameBox&    operator =( const FontNameBox& ) = delete;
 };
 
-class SVT_DLLPUBLIC FontStyleBox final : public ComboBox
+class FontStyleBox final : public ComboBox
 {
     Size            aOptimalSize;
 
diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx
index e2b7b1f5a238..6387bbd42921 100644
--- a/include/svtools/svmedit2.hxx
+++ b/include/svtools/svmedit2.hxx
@@ -24,7 +24,7 @@
 
 class TextAttrib;
 
-class SVT_DLLPUBLIC ExtMultiLineEdit final : public MultiLineEdit
+class ExtMultiLineEdit final : public MultiLineEdit
 {
 public:
                     ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle );
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index b9559147c58e..6b3cbebf872f 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -26,7 +26,7 @@
 
 class SfxItemPool;
 
-class SVX_DLLPUBLIC AffineMatrixItem final : public SfxPoolItem
+class AffineMatrixItem final : public SfxPoolItem
 {
 private:
     css::geometry::AffineMatrix2D        maMatrix;
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index f66d06b30b05..0ce1722ff130 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -28,7 +28,7 @@ class SvxColorValueSet;
 
 typedef std::pair<Color, OUString> NamedColor;
 
-class SVX_DLLPUBLIC Palette
+class Palette
 {
 public:
     virtual ~Palette();
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index e43453c5b2de..ddbcbb3a60cf 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -32,7 +32,7 @@ class GalleryTheme;
 class GalleryBrowser2;
 class INetURLObject;
 
-class SVX_DLLPUBLIC GalleryPreview final : public vcl::Window, public DropTargetHelper, public DragSourceHelper
+class GalleryPreview final : public vcl::Window, public DropTargetHelper, public DragSourceHelper
 {
 private:
 
@@ -40,24 +40,24 @@ private:
     tools::Rectangle           aPreviewRect;
     GalleryTheme* const       mpTheme;
 
-    SVX_DLLPRIVATE bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
-    SVX_DLLPRIVATE void             InitSettings();
+    bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
+    void             InitSettings();
 
     // Window
-    SVX_DLLPRIVATE virtual void     Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
-    SVX_DLLPRIVATE virtual Size     GetOptimalSize() const override;
-    SVX_DLLPRIVATE virtual void     MouseButtonDown(const MouseEvent& rMEvt) override;
-    SVX_DLLPRIVATE virtual void     Command(const CommandEvent& rCEvt) override;
-    SVX_DLLPRIVATE virtual void     KeyInput( const KeyEvent& rKEvt ) override;
-    SVX_DLLPRIVATE virtual void     DataChanged( const DataChangedEvent& rDCEvt ) override;
+    virtual void     Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
+    virtual Size     GetOptimalSize() const override;
+    virtual void     MouseButtonDown(const MouseEvent& rMEvt) override;
+    virtual void     Command(const CommandEvent& rCEvt) override;
+    virtual void     KeyInput( const KeyEvent& rKEvt ) override;
+    virtual void     DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 
     // DropTargetHelper
-    SVX_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
-    SVX_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
+    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
+    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
 
     // DragSourceHelper
-    SVX_DLLPRIVATE virtual void     StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override;
+    virtual void     StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override;
 
 public:
 
diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx
index ae8aaab1634f..5b438f8c4d6a 100644
--- a/include/vcl/animate/AnimationBitmap.hxx
+++ b/include/vcl/animate/AnimationBitmap.hxx
@@ -30,7 +30,7 @@ enum class Disposal
     Previous
 };
 
-struct VCL_DLLPUBLIC AnimationBitmap
+struct AnimationBitmap
 {
     BitmapEx maBitmapEx;
     Point maPositionPixel;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 0b32b85f341c..c39c466d1afe 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -247,7 +247,7 @@ public:
     virtual void    Click() override;
 };
 
-class VCL_DLLPUBLIC CloseButton final : public CancelButton
+class CloseButton final : public CancelButton
 {
 public:
     explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0);
@@ -517,9 +517,9 @@ public:
     explicit        TriStateBox( vcl::Window* pParent, WinBits nStyle );
 };
 
-class VCL_DLLPUBLIC DisclosureButton final : public CheckBox
+class DisclosureButton final : public CheckBox
 {
-    SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override;
+    virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override;
 
 public:
     explicit DisclosureButton( vcl::Window* pParent );
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index a3ee2fb73c99..bf446e7f4f83 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -170,7 +170,7 @@ public:
                         { return ((mnCode & KEY_MOD2) != 0); }
 };
 
-class VCL_DLLPUBLIC CommandScrollData
+class CommandScrollData
 {
 private:
     long            mnDeltaX;
@@ -183,7 +183,7 @@ public:
     long            GetDeltaY() const { return mnDeltaY; }
 };
 
-class VCL_DLLPUBLIC CommandModKeyData
+class CommandModKeyData
 {
 private:
     bool            mbDown;
@@ -256,7 +256,7 @@ public:
     bool GetPassThroughToOS() const { return m_bPassThroughToOS; }
 };
 
-class VCL_DLLPUBLIC CommandSelectionChangeData
+class CommandSelectionChangeData
 {
 private:
     sal_uLong          mnStart;
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index e0d498761d29..a6f458265cbb 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -16,7 +16,7 @@
 
 namespace vcl { class Window; }
 
-class VCL_DLLPUBLIC DebugEventInjector final : private Timer {
+class DebugEventInjector final : private Timer {
   sal_uInt32 mnEventsLeft;
   DebugEventInjector( sal_uInt32 nMaxEvents );
 
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index bc2e6cc03a75..a30b3909e899 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -51,7 +51,7 @@ class ImpGraphic;
 class OutputDevice;
 class ReaderData;
 
-class VCL_DLLPUBLIC GraphicReader
+class GraphicReader
 {
 public:
     virtual         ~GraphicReader();
diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index a9bf0ce7bc8f..2310328904e9 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -47,7 +47,7 @@ class SvStream;
 #define IMAP_ERR_OK         0x00000000L
 #define IMAP_ERR_FORMAT     0x00000001L
 
-class VCL_DLLPUBLIC IMapObject
+class IMapObject
 {
     friend class        ImageMap;
 
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 5e7ebc47de73..8108abe046dc 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -472,7 +472,7 @@ public:
  *
  *  Value container for menubars specifying height of adjacent docking area
  */
-class VCL_DLLPUBLIC MenubarValue final : public ImplControlValue
+class MenubarValue final : public ImplControlValue
 {
 public:
     MenubarValue() : ImplControlValue( ControlType::Menubar, 0 )
@@ -491,7 +491,7 @@ public:
  * Value container for menu items; specifies the rectangle for the whole item which
  * may be useful when drawing parts with a smaller rectangle.
  */
-class VCL_DLLPUBLIC MenupopupValue final : public ImplControlValue
+class MenupopupValue final : public ImplControlValue
 {
 public:
     MenupopupValue( long i_nGutterWidth, const tools::Rectangle& i_rItemRect )
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index a8722c46fed4..34aa048e5abd 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -135,7 +135,7 @@ protected:
 };
 
 // TODO: moggi: what about push buttons?
-class UITEST_DLLPUBLIC ButtonUIObject final : public WindowUIObject
+class ButtonUIObject final : public WindowUIObject
 {
     VclPtr<Button> mxButton;
 public:
@@ -157,7 +157,7 @@ private:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC DialogUIObject final : public WindowUIObject
+class DialogUIObject final : public WindowUIObject
 {
     VclPtr<Dialog> mxDialog;
 
@@ -175,7 +175,7 @@ private:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC EditUIObject : public WindowUIObject
+class EditUIObject : public WindowUIObject
 {
     VclPtr<Edit> mxEdit;
 
@@ -198,7 +198,7 @@ protected:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC MultiLineEditUIObject final : public WindowUIObject
+class MultiLineEditUIObject final : public WindowUIObject
 {
     VclPtr<VclMultiLineEdit> mxEdit;
 
@@ -220,7 +220,7 @@ private:
 };
 
 // TODO: moggi: maybe let it inherit from the button case
-class UITEST_DLLPUBLIC CheckBoxUIObject final : public WindowUIObject
+class CheckBoxUIObject final : public WindowUIObject
 {
 private:
     VclPtr<CheckBox> mxCheckBox;
@@ -286,7 +286,7 @@ private:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC ListBoxUIObject final : public WindowUIObject
+class ListBoxUIObject final : public WindowUIObject
 {
 private:
     VclPtr<ListBox> mxListBox;
@@ -311,7 +311,7 @@ private:
 };
 
 // TODO: moggi: should it inherit from EditUIObject?
-class UITEST_DLLPUBLIC ComboBoxUIObject final : public WindowUIObject
+class ComboBoxUIObject final : public WindowUIObject
 {
 private:
     VclPtr<ComboBox> mxComboBox;
diff --git a/oox/inc/drawingml/presetgeometrynames.hxx b/oox/inc/drawingml/presetgeometrynames.hxx
index 358fc9acefb6..f3ab92c2347a 100644
--- a/oox/inc/drawingml/presetgeometrynames.hxx
+++ b/oox/inc/drawingml/presetgeometrynames.hxx
@@ -15,8 +15,8 @@
 
 namespace PresetGeometryTypeNames
 {
-OOX_DLLPUBLIC OUString GetFontworkType(const OUString& rMsoType);
-OOX_DLLPUBLIC OUString GetMsoName(const OUString& rFontworkType);
+OUString GetFontworkType(const OUString& rMsoType);
+OUString GetMsoName(const OUString& rFontworkType);
 }
 
 #endif
diff --git a/sfx2/source/notebookbar/DropdownBox.hxx b/sfx2/source/notebookbar/DropdownBox.hxx
index 6cb62d4e2f93..0fd1b687ea2c 100644
--- a/sfx2/source/notebookbar/DropdownBox.hxx
+++ b/sfx2/source/notebookbar/DropdownBox.hxx
@@ -30,8 +30,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include "NotebookbarPopup.hxx"
 
-class SFX2_DLLPUBLIC DropdownBox : public VclHBox,
-                                   public vcl::IPrioritable
+class DropdownBox : public VclHBox, public vcl::IPrioritable
 {
 private:
     bool m_bInFullView;
diff --git a/sfx2/source/notebookbar/NotebookbarPopup.hxx b/sfx2/source/notebookbar/NotebookbarPopup.hxx
index 1bbb15133bbe..5ac1377c02a7 100644
--- a/sfx2/source/notebookbar/NotebookbarPopup.hxx
+++ b/sfx2/source/notebookbar/NotebookbarPopup.hxx
@@ -30,7 +30,7 @@
  * and after close moved to the original parent
  */
 
-class SFX2_DLLPUBLIC NotebookbarPopup : public FloatingWindow
+class NotebookbarPopup : public FloatingWindow
 {
 private:
     VclPtr<VclHBox> m_pBox;
diff --git a/sfx2/source/notebookbar/PriorityHBox.hxx b/sfx2/source/notebookbar/PriorityHBox.hxx
index 8248264093f5..4c5bbc7ac9f8 100644
--- a/sfx2/source/notebookbar/PriorityHBox.hxx
+++ b/sfx2/source/notebookbar/PriorityHBox.hxx
@@ -34,7 +34,7 @@
  * priority assigned (VCL_PRIORITY_DEFAULT), it is always shown.
  */
 
-class SFX2_DLLPUBLIC PriorityHBox : public VclHBox
+class PriorityHBox : public VclHBox
 {
 private:
     bool m_bInitialized;
diff --git a/sfx2/source/notebookbar/PriorityMergedHBox.cxx b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
index e187306ff437..328241ae67d8 100644
--- a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
@@ -30,7 +30,7 @@
 * PriorityMergedHBox is a VclHBox which hides its own children if there is no sufficient space.
 */
 
-class SFX2_DLLPUBLIC PriorityMergedHBox : public PriorityHBox
+class PriorityMergedHBox : public PriorityHBox
 {
 private:
     VclPtr<PushButton> m_pButton;
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
index c02ffae7fbbe..fe88af7f2b5a 100644
--- a/svx/inc/palettes.hxx
+++ b/svx/inc/palettes.hxx
@@ -29,7 +29,7 @@ typedef std::vector< NamedColor > ColorList;
 
 // ASE = Adobe Swatch Exchange
 
-class SVX_DLLPUBLIC PaletteASE : public Palette
+class PaletteASE : public Palette
 {
     bool        mbValidPalette;
     OUString const    maFPath;
@@ -51,7 +51,7 @@ public:
 
 // GPL - this is *not* GNU Public License, but is the Gimp PaLette
 
-class SVX_DLLPUBLIC PaletteGPL : public Palette
+class PaletteGPL : public Palette
 {
     bool        mbLoadedPalette;
     bool        mbValidPalette;
@@ -77,7 +77,7 @@ public:
 
 // SOC - Star Office Color-table
 
-class SVX_DLLPUBLIC PaletteSOC : public Palette
+class PaletteSOC : public Palette
 {
     bool            mbLoadedPalette;
     OUString const        maFPath;
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index 3753596a4e6f..f01a9116deb6 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
 
-class SW_DLLPUBLIC PageColumnPopup : public SfxToolBoxControl
+class PageColumnPopup : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index 7a66ca8e3db9..2bb9617858f0 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
 
-class SW_DLLPUBLIC PageMarginPopup : public SfxToolBoxControl
+class PageMarginPopup : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index b8cdacb79dfb..ff88d7af5300 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
 
-class SW_DLLPUBLIC PageOrientationPopup : public SfxToolBoxControl
+class PageOrientationPopup : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index a604accde35e..b67779552201 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/tbxctrl.hxx>
 #include "swdllapi.h"
 
-class SW_DLLPUBLIC PageSizePopup : public SfxToolBoxControl
+class PageSizePopup : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 93dae6f72f99..cd5fb964205c 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -23,7 +23,7 @@
 #include <swdllapi.h>
 
 // numerical input
-class SW_DLLPUBLIC NumEditAction: public NumericField
+class NumEditAction: public NumericField
 {
     Link<NumEditAction&,void> aActionLink;
 
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 86a911fa4adf..59246ae5053d 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -63,13 +63,13 @@ public:
     sal_uInt16 GetBestPaletteIndex(const BitmapColor& rColor);
 };
 
-class VCL_PLUGIN_PUBLIC InverseColorMap
+class InverseColorMap
 {
 private:
     std::vector<sal_uInt8> mpBuffer;
     std::vector<sal_uInt8> mpMap;
 
-    SAL_DLLPRIVATE void ImplCreateBuffers();
+    void ImplCreateBuffers();
 
 public:
     explicit InverseColorMap(const BitmapPalette& rPal);
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 2d3c5ac16c89..297cd5fa359a 100644
--- a/vcl/inc/impfontcharmap.hxx
+++ b/vcl/inc/impfontcharmap.hxx
@@ -28,7 +28,7 @@ typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef;
 
 class CmapResult;
 
-class VCL_PLUGIN_PUBLIC ImplFontCharMap : public SvRefBase
+class ImplFontCharMap : public SvRefBase
 {
 public:
     explicit            ImplFontCharMap( const CmapResult& );
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index cc1e28190916..bff248d9bfab 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -39,7 +39,7 @@ enum class DrawShaderType
     Line
 };
 
-class VCL_PLUGIN_PUBLIC OpenGLProgram
+class OpenGLProgram
 {
 private:
     GLuint          mnId;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 06300760f60e..be66bafd87e3 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -50,7 +50,7 @@ namespace vcl {
 }
 
 // used for managing runs e.g. for BiDi, glyph and script fallback
-class VCL_PLUGIN_PUBLIC ImplLayoutRuns
+class ImplLayoutRuns
 {
 private:
     int                 mnRunIndex;
@@ -122,7 +122,7 @@ private:
 // For nice SAL_INFO logging of ImplLayoutArgs values
 std::ostream &operator <<(std::ostream& s, ImplLayoutArgs const &rArgs);
 
-class VCL_PLUGIN_PUBLIC MultiSalLayout final : public SalLayout
+class MultiSalLayout final : public SalLayout
 {
 public:
     void            DrawText(SalGraphics&) const override;
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index 17084fcf5a75..f000264ac3dd 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -102,7 +102,7 @@ public:
 };
 
 // a class for cache entries for physical font instances that are based on serverfonts
-class VCL_DLLPUBLIC FreetypeFontInstance : public LogicalFontInstance
+class FreetypeFontInstance : public LogicalFontInstance
 {
     friend rtl::Reference<LogicalFontInstance> FreetypeFontFace::CreateFontInstance(const FontSelectPattern&) const;
 
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index ccb25cab87e2..b9398ad57d0f 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -88,7 +88,7 @@ private:
     sal_IntPtr              m_nMaxFontId;
 };
 
-class VCL_DLLPUBLIC FreetypeFont final
+class FreetypeFont final
 {
 public:
                             FreetypeFont(LogicalFontInstance* pFontInstance, FreetypeFontInfo*);
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index e33d3f606b10..c958e0c69bb2 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -40,7 +40,7 @@ private:
     std::unique_ptr<GtkSalPrinter_Impl> m_xImpl;
 };
 
-class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter
+class GtkSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
     sal_uInt32 GetCapabilities(const ImplJobSetup* i_pSetupData, PrinterCapType i_nType) override;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 8f4bceba0fc8..56006781f8f8 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -208,7 +208,7 @@ extern "C" {
     typedef Bool(*X_if_predicate)(Display*,XEvent*,XPointer);
 }
 
-class VCLPLUG_GEN_PUBLIC GLX11Window : public GLWindow
+class GLX11Window : public GLWindow
 {
 public:
     Display*           dpy;