make some classes module-private

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

37 files changed, 54 insertions, 54 deletions

diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 7a930d69eb5e..a41c8d1b4321 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -35,7 +35,7 @@ namespace basegfx
 
         @see B2ITuple
     */
-    class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2IPoint : public ::basegfx::B2ITuple
+    class SAL_WARN_UNUSED B2IPoint : public ::basegfx::B2ITuple
     {
     public:
         /** Create a 2D Point
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index f32fa5ecc3d8..2bd2b47708e8 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -126,7 +126,7 @@ namespace comphelper
         calls which your derived class gets to the dispose method of this class.</p>
     */
 
-    class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 <   css::lang::XEventListener
+    class OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 <   css::lang::XEventListener
                                                                         >
                                             ,private OProxyAggregation
     {
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 7442ad1b0b8a..8e1aa77e19b3 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -114,7 +114,7 @@ namespace connectivity
         typedef sdbcx::OColumn OOrderColumn_BASE;
         typedef ::comphelper::OPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP;
 
-        class OOO_DLLPUBLIC_DBTOOLS OOrderColumn :
+        class OOrderColumn :
             public OOrderColumn_BASE, public OOrderColumn_PROP
         {
             const   bool        m_bAscending;
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index a17fa6a75ade..841a96222aa2 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -28,7 +28,7 @@ namespace dbtools
 
     //= OParameterContinuation
 
-    class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation final : public comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
+    class OParameterContinuation final : public comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
     {
         css::uno::Sequence< css::beans::PropertyValue >       m_aValues;
 
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index 452828f27039..de03af913e6b 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OIndexHelper final : public connectivity::sdbcx::OIndex
+    class OIndexHelper final : public connectivity::sdbcx::OIndex
     {
         OTableHelper*   m_pTable;
     public:
diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 8de56e7fc063..37eecea0497c 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OIndexHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OIndexColumns final : public sdbcx::OCollection
+    class OIndexColumns final : public sdbcx::OCollection
     {
         OIndexHelper* m_pIndex;
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index aecd75525343..131d1c7fcbee 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper final : public connectivity::sdbcx::OKey
+    class OTableKeyHelper final : public connectivity::sdbcx::OKey
     {
         OTableHelper*   m_pTable;
     public:
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index 13039cbd39d9..7d8b16489125 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -26,7 +26,7 @@
 namespace connectivity
 {
     class OTableKeyHelper;
-    class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper final : public connectivity::sdbcx::OCollection
+    class OKeyColumnsHelper final : public connectivity::sdbcx::OCollection
     {
         OTableKeyHelper* m_pKey;
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index f09e3049e4d8..32bf388e7bb3 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -29,7 +29,7 @@ namespace connectivity
 
     /** special node for avoiding memory leaks
     */
-    class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode final : public OSQLParseNode
+    class OSQLInternalNode final : public OSQLParseNode
     {
     public:
         OSQLInternalNode(const sal_Char* pNewValue,
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index 6eecf9459e22..b64c536fd61c 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -30,7 +30,7 @@ namespace connectivity
         class OKeyColumn;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP;
 
-        class OOO_DLLPUBLIC_DBTOOLS OKeyColumn :
+        class OKeyColumn :
             public OColumn, public OKeyColumn_PROP
         {
             OUString m_ReferencedColumn;
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 61c9ff5efc3b..99facc07da56 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -71,7 +71,7 @@ namespace connectivity
 
     //= SQLParseNodeParameter
 
-    struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter
+    struct SQLParseNodeParameter
     {
         const css::lang::Locale&                              rLocale;
         ::dbtools::DatabaseMetaData                           aMetaData;
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 0a0025644fc3..40b60ee07c6b 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -58,7 +58,7 @@ namespace connectivity
 
     //= OParseContext
 
-    class OOO_DLLPUBLIC_DBTOOLS OParseContext final : public IParseContext
+    class OParseContext final : public IParseContext
     {
     public:
         OParseContext();
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 2ceac71c9ec1..e09ede20ea8d 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -29,7 +29,7 @@ namespace connectivity
 
     /** Scanner for SQL92
     */
-    class OOO_DLLPUBLIC_DBTOOLS OSQLScanner
+    class OSQLScanner
     {
         const IParseContext*    m_pContext;                 // context for parse, knows all international stuff
         OString          m_sStatement;               // statement to parse
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 08f2b50a4789..0b50a51d2fdb 100644
--- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer
             Of course this is a primitive, so feel free to just ignore all that
             stuff and use the automatically generated decomposition. Sigh.
         */
-        class DRAWINGLAYER_DLLPUBLIC CropPrimitive2D final : public GroupPrimitive2D
+        class CropPrimitive2D final : public GroupPrimitive2D
         {
         private:
             // the transformation already applied to the child geometry
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index 4e0a34692f72..78f6a53f6158 100644
--- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
     namespace primitive2d
     {
         /** EpsPrimitive2D class */
-        class DRAWINGLAYER_DLLPUBLIC EpsPrimitive2D final : public BufferedDecompositionPrimitive2D
+        class EpsPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// the geometry definition
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index c721b2116f1f..4be6aaccc5c5 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -48,7 +48,7 @@ namespace drawinglayer
 
             The decomposition will deliver the hatch lines.
          */
-        class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class FillHatchPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometrically visible area
diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 1438f3437fd9..0915ef1a8aae 100644
--- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer
             should process it (Currently it is only used for grid visualisation,
             but this may change).
          */
-        class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D final : public BasePrimitive2D
+        class PointArrayPrimitive2D final : public BasePrimitive2D
         {
         private:
             /// the array of positions
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index d37a8eb6c25e..cda854fe144c 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -210,7 +210,7 @@ namespace drawinglayer
             This primitive defines a waveline based on a PolygonStrokePrimitive2D
             where the wave is defined by wave width and wave length.
          */
-        class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D
+        class PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D
         {
         private:
             /// wave definition
diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 274034bc1089..9c2d31160ac8 100644
--- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -306,7 +306,7 @@ namespace drawinglayer
             It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent
             decompositions allowing reduced color steps
          **/
-        class DRAWINGLAYER_DLLPUBLIC SvgLinearAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class SvgLinearAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometric definition in unit coordinates
@@ -350,7 +350,7 @@ namespace drawinglayer
             It's derived from DiscreteMetricDependentPrimitive2D to allow view-dependent
             decompositions allowing reduced color steps
          **/
-        class DRAWINGLAYER_DLLPUBLIC SvgRadialAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
+        class SvgRadialAtomPrimitive2D final : public DiscreteMetricDependentPrimitive2D
         {
         private:
             /// the geometric definition in unit coordinates
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 1f57ec4a54e3..74ca61e23b8b 100644
--- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
             also be used for any other primitives) which have some TextEffect applied
             and create the needed geometry and embedding on decomposition.
         */
-        class DRAWINGLAYER_DLLPUBLIC TextEffectPrimitive2D final : public BufferedDecompositionPrimitive2D
+        class TextEffectPrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// the text (or other) content
diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
index e092db8a2906..c9bf017a6589 100644
--- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
@@ -32,7 +32,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextLinePrimitive2D final : public BufferedDecompositionPrimitive2D
+        class TextLinePrimitive2D final : public BufferedDecompositionPrimitive2D
         {
         private:
             /// geometric definitions
diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index 3247cfad3569..de0658910192 100644
--- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
@@ -34,7 +34,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D
+        class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
             /// geometric definitions
@@ -67,7 +67,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
+        class TextCharacterStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
         {
         private:
             sal_Unicode                             maStrikeoutChar;
@@ -106,7 +106,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class DRAWINGLAYER_DLLPUBLIC TextGeometryStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
+        class TextGeometryStrikeoutPrimitive2D final : public BaseTextStrikeoutPrimitive2D
         {
         private:
             double                                  mfHeight;
diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index a9dd81dadac8..092337c3bf2c 100644
--- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer
             layouting which is dependent from WallpaperStyle; thus it does not need
             to be handled anywhere else in the future.
          */
-        class DRAWINGLAYER_DLLPUBLIC WallpaperBitmapPrimitive2D final : public ViewTransformationDependentPrimitive2D
+        class WallpaperBitmapPrimitive2D final : public ViewTransformationDependentPrimitive2D
         {
         private:
             basegfx::B2DRange                   maObjectRange;
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index 639e471cd1e8..a2526539da02 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -38,7 +38,7 @@ namespace accessibility {
     are all the specified property names and values that differ from the
     default values in the style.</p>
 */
-class SVX_DLLPUBLIC DescriptionGenerator
+class DescriptionGenerator
 {
 public:
     enum class PropertyType {
@@ -122,12 +122,12 @@ private:
 
     /** Add a property value formatted as color to the description string.
     */
-    SVX_DLLPRIVATE void AddColor (const OUString& sPropertyName,
+    void AddColor (const OUString& sPropertyName,
         const OUString& sLocalizedName);
 
     /** Add a property value formatted as integer to the description string.
     */
-    SVX_DLLPRIVATE void AddInteger (const OUString& sPropertyName,
+    void AddInteger (const OUString& sPropertyName,
         const OUString& sLocalizedName);
 };
 
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 08f7c866aa4d..b985b3a728ac 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -110,7 +110,7 @@ public:
 
 class ImpXPolyPolygon;
 
-class SVX_DLLPUBLIC XPolyPolygon final
+class XPolyPolygon final
 {
     o3tl::cow_wrapper< ImpXPolyPolygon > pImpXPolyPolygon;
 
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index f1446b9e215a..a7ec8c67cc27 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -30,7 +30,7 @@
 |*
 \************************************************************************/
 
-class SVX_DLLPUBLIC XOutdevItemPool : public SfxItemPool
+class XOutdevItemPool : public SfxItemPool
 {
 protected:
     std::vector<SfxPoolItem*>*     mpLocalPoolDefaults;
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 3240dac27e99..9550d8b48c02 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -31,7 +31,7 @@
 //  class VCLXContainer
 
 
-class TOOLKIT_DLLPUBLIC VCLXContainer : public css::awt::XVclContainer,
+class VCLXContainer : public css::awt::XVclContainer,
                         public css::awt::XVclContainerPeer,
                         public VCLXWindow
 {
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index 186cb7b915b6..04e65d1b5df6 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -26,7 +26,7 @@
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
+class VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
                                                     public VCLXWindow
 {
 public:
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 08777e280cee..188f128f793e 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -35,7 +35,7 @@ typedef ::cppu::ImplHelper1 <   css::awt::XTopWindow2
 typedef ::cppu::ImplHelper1 <   css::awt::XSystemDependentWindowPeer
                             >   VCLXTopWindow_SBase;
 
-class TOOLKIT_DLLPUBLIC VCLXTopWindow_Base  :public VCLXTopWindow_XBase
+class VCLXTopWindow_Base  :public VCLXTopWindow_XBase
                                             ,public VCLXTopWindow_SBase
 {
 protected:
@@ -75,7 +75,7 @@ public:
 //  class VCLXTopWindow
 
 
-class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base,
+class VCLXTopWindow: public VCLXTopWindow_Base,
                      public VCLXContainer
 {
 protected:
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 0a5d0a7b79b2..ab3d0a4ec53a 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -66,7 +66,7 @@ class TabPage;
 //    deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model
 
 
-class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow
+class VCLXGraphicControl : public VCLXWindow
 {
 private:
     /// the image we currently display
@@ -350,7 +350,7 @@ public:
 
 //  class VCLXDialog
 
-class TOOLKIT_DLLPUBLIC VCLXDialog final : public css::awt::XDialog2,
+class VCLXDialog final : public css::awt::XDialog2,
                     public VCLXTopWindow
 {
 public:
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 0bed25484bee..6c1dc600a7ea 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -30,7 +30,7 @@
 //  class UnoControlBase
 
 
-class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
+class UnoControlBase : public UnoControl
 {
 protected:
     UnoControlBase() :UnoControl() {}
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index f171a59c364b..34dbb3ce277e 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -57,7 +57,7 @@ typedef ::cppu::WeakAggImplHelper7  <   css::awt::XControlModel
                                     ,   css::util::XCloneable
                                     >   UnoControlModel_Base;
 
-class TOOLKIT_DLLPUBLIC UnoControlModel :public UnoControlModel_Base
+class UnoControlModel :public UnoControlModel_Base
                                         ,public MutexAndBroadcastHelper
                                         ,public ::cppu::OPropertySetHelper
 {
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index c3c16b2fe6c4..4bf493915b2d 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -738,7 +738,7 @@ struct UnoControlListBoxModel_Data;
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
                                             ,   css::awt::XItemList
                                             >   UnoControlListBoxModel_Base;
-class TOOLKIT_DLLPUBLIC UnoControlListBoxModel : public UnoControlListBoxModel_Base
+class UnoControlListBoxModel : public UnoControlListBoxModel_Base
 {
 protected:
     enum ConstructorMode
@@ -845,7 +845,7 @@ typedef ::cppu::AggImplInheritanceHelper5   <   UnoControlBase
                                             ,   css::awt::XTextLayoutConstrains
                                             ,   css::awt::XItemListListener
                                             >   UnoListBoxControl_Base;
-class TOOLKIT_DLLPUBLIC UnoListBoxControl final : public UnoListBoxControl_Base
+class UnoListBoxControl final : public UnoListBoxControl_Base
 {
 public:
                         UnoListBoxControl();
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 57ca15260f05..f60014bb315d 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -370,7 +370,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclPaned : public VclContainer
+class VclPaned : public VclContainer
 {
 protected:
     VclPtr<Splitter> m_pSplitter;
@@ -384,7 +384,7 @@ public:
     void set_position(long nPosition) { m_nPosition = nPosition; }
 };
 
-class VCL_DLLPUBLIC VclVPaned final : public VclPaned
+class VclVPaned final : public VclPaned
 {
 private:
     DECL_LINK(SplitHdl, Splitter*, void);
@@ -396,7 +396,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclHPaned final : public VclPaned
+class VclHPaned final : public VclPaned
 {
 private:
     DECL_LINK(SplitHdl, Splitter*, void);
@@ -408,7 +408,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
 };
 
-class VCL_DLLPUBLIC VclFrame final : public VclBin
+class VclFrame final : public VclBin
 {
 private:
     VclPtr<vcl::Window> m_pLabel;
@@ -458,7 +458,7 @@ private:
     sal_Int32 m_nTopPadding;
 };
 
-class VCL_DLLPUBLIC VclExpander final : public VclBin
+class VclExpander final : public VclBin
 {
 public:
     VclExpander(vcl::Window *pParent)
@@ -494,7 +494,7 @@ private:
     bool m_bResizeTopLevel;
     VclPtr<DisclosureButton> m_pDisclosureButton;
     Link<VclExpander&,void> maExpandedHdl;
-    DECL_DLLPRIVATE_LINK(ClickHdl, CheckBox&, void);
+    DECL_LINK(ClickHdl, CheckBox&, void);
 };
 
 class VCL_DLLPUBLIC VclScrolledWindow final : public VclBin
@@ -526,7 +526,7 @@ private:
     VclPtr<ScrollBarBox> m_aScrollBarBox;
 };
 
-class VCL_DLLPUBLIC VclViewport final : public VclBin
+class VclViewport final : public VclBin
 {
 public:
     VclViewport(vcl::Window *pParent)
@@ -544,7 +544,7 @@ private:
 //
 //by default the Commands are discarded, inherit from this
 //and implement "Command" to get them
-class VCL_DLLPUBLIC VclEventBox final : public VclBin
+class VclEventBox final : public VclBin
 {
 private:
     //Any Commands an EventBoxHelper receives are forwarded to its parent
@@ -585,7 +585,7 @@ public:
     virtual void Command(const CommandEvent& rCEvt) override;
 };
 
-class VCL_DLLPUBLIC VclSizeGroup
+class VclSizeGroup
 {
 private:
     std::set< VclPtr<vcl::Window> > m_aWindows;
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 4ae64ace4602..f396b94c5f52 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -450,7 +450,7 @@ class SAL_DLLPUBLIC_RTTI SpinbuttonValue final : public ImplControlValue
  *
  *  Value container for toolbars detailing the grip position
  */
-class VCL_DLLPUBLIC ToolbarValue final : public ImplControlValue
+class ToolbarValue final : public ImplControlValue
 {
 public:
     ToolbarValue() : ImplControlValue( ControlType::Toolbar, 0 )
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 9afbdbc5a3b4..f33fc5a29b89 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -406,7 +406,7 @@ private:
     virtual OUString get_name() const override;
 };
 
-class UITEST_DLLPUBLIC TreeListUIObject final : public WindowUIObject
+class TreeListUIObject final : public WindowUIObject
 {
 public:
     TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList);
@@ -429,7 +429,7 @@ private:
     VclPtr<SvTreeListBox> mxTreeList;
 };
 
-class UITEST_DLLPUBLIC TreeListEntryUIObject final : public UIObject
+class TreeListEntryUIObject final : public UIObject
 {
 public:
 
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 14356b5b7487..12c7f7361366 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -23,7 +23,7 @@ namespace com { namespace sun { namespace star { namespace uno { template <typen
 
 class UIObject;
 
-class UITEST_DLLPUBLIC UITest
+class UITest
 {
 public: