make some classes module-private

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

34 files changed, 50 insertions, 50 deletions

diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 5bd7119c548c..8de3e7db933d 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -75,7 +75,7 @@ public:
     virtual ~Crypto();
 };
 
-class OOX_DLLPUBLIC Decrypt final : public Crypto
+class Decrypt final : public Crypto
 {
 public:
     Decrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
@@ -93,7 +93,7 @@ public:
 
 };
 
-class OOX_DLLPUBLIC Encrypt final : public Crypto
+class Encrypt final : public Crypto
 {
 public:
     Encrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index e32667760c9f..10a971182c8b 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ole { class OleStorage; } }
 namespace oox {
 namespace core {
 
-class OOX_DLLPUBLIC DocumentDecryption
+class DocumentDecryption
 {
 private:
     enum CryptoType
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 944e6b06c910..36455c1b7af5 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -26,7 +26,7 @@ namespace oox { namespace ole { class OleStorage; } }
 namespace oox {
 namespace core {
 
-class OOX_DLLPUBLIC DocumentEncryption
+class DocumentEncryption
 {
 private:
     css::uno::Reference< css::io::XStream > mxDocumentStream;
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 9ef49331e994..cf3a964de8bd 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -42,7 +42,7 @@ namespace oox {
 
     The binary data in the stream is written in little-endian format.
  */
-class OOX_DLLPUBLIC BinaryOutputStream : public virtual BinaryStreamBase
+class BinaryOutputStream : public virtual BinaryStreamBase
 {
 public:
     /** Derived classes implement writing the contents of the passed data
@@ -168,7 +168,7 @@ private:
     construction, the stream points to the beginning of the passed data
     sequence. The data sequence is expanded automatically while writing to it.
  */
-class OOX_DLLPUBLIC SequenceOutputStream final : public BinaryOutputStream
+class SequenceOutputStream final : public BinaryOutputStream
 {
 public:
     /** Constructs the wrapper object for the passed data sequence.
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 9868fc542400..f5302d470738 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -120,7 +120,7 @@ private:
 /** Base class for binary input and output streams wrapping a UNO stream,
     seekable via the com.sun.star.io.XSeekable interface.
  */
-class OOX_DLLPUBLIC BinaryXSeekableStream : public virtual BinaryStreamBase
+class BinaryXSeekableStream : public virtual BinaryStreamBase
 {
 public:
     virtual             ~BinaryXSeekableStream() override;
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 58199fc463f6..e72c356f1864 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -50,7 +50,7 @@ namespace ole {
 
 class VbaModule;
 
-class OOX_DLLPUBLIC VbaFilterConfig
+class VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index 875f0ecbfd98..c024bec8bfef 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -250,7 +250,7 @@ struct OOX_DLLPUBLIC ShadowModel
 };
 
 /** The shadow model structure contains all shape textpath properties. */
-struct OOX_DLLPUBLIC TextpathModel
+struct TextpathModel
 {
     OptValue<OUString> moString;                  ///< Specifies the string of the textpath.
     OptValue<OUString> moStyle;                   ///< Specifies the style of the textpath.
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index dc4db50c27fe..5ec471299f3f 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -58,7 +58,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA          = 4;
 
 
 /** The shape model structure contains all properties shared by all types of shapes. */
-struct OOX_DLLPUBLIC ShapeTypeModel
+struct ShapeTypeModel
 {
     OUString     maShapeId;              ///< Unique identifier of the shape.
     OUString     maLegacyId;             ///< Plaintext identifier of the shape.
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 5a8820875845..8e77f2831d25 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -72,7 +72,7 @@ createBaseURI(
 
 struct DocumentMetadataAccess_Impl;
 
-class SFX2_DLLPUBLIC DocumentMetadataAccess final :
+class DocumentMetadataAccess final :
     public cppu::WeakImplHelper<css::rdf::XDocumentMetadataAccess>
 {
     DocumentMetadataAccess(const DocumentMetadataAccess&) = delete;
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 9469aeec14ef..6eb48dddd47a 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -54,7 +54,7 @@ template<> struct typed_flags<sfx2::ApplicationType> : is_typed_flags<sfx2::Appl
 namespace sfx2
 {
 
-class SFX2_DLLPUBLIC RecentDocsView final : public ThumbnailView
+class RecentDocsView final : public ThumbnailView
 {
 public:
     RecentDocsView( vcl::Window* pParent );
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index 42db1081b5c1..26ef4a7134e3 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -33,7 +33,7 @@ namespace sfx2 { namespace sidebar {
     directly is that this way the sidebar has a little more control
     over look and feel of its controls.
 */
-class SFX2_DLLPUBLIC ControlFactory
+class ControlFactory
 {
 public:
     /** Create the menu button for the task bar.
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 4dfff756415d..056271701110 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -33,7 +33,7 @@ namespace sfx2 { namespace sidebar {
 
 /** Convenience class for the easy creation of toolbox controllers.
 */
-class SFX2_DLLPUBLIC ControllerFactory
+class ControllerFactory
 {
 public:
     static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 97b26c368dd9..3132553f5991 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star::frame { class XFrame; }
 
 namespace sfx2 { namespace sidebar {
 
-class SFX2_DLLPUBLIC Tools
+class Tools
 {
 public:
     static Image GetImage (
diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx
index 614b1d2b6a09..fbea139b9792 100644
--- a/include/svx/ClassificationEditView.hxx
+++ b/include/svx/ClassificationEditView.hxx
@@ -27,7 +27,7 @@ public:
     virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor) override;
 };
 
-class SVX_DLLPUBLIC ClassificationEditView final : public WeldEditView
+class ClassificationEditView final : public WeldEditView
 {
 public:
     ClassificationEditView();
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 4f2df5e81e23..8b97a35a11c0 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -21,7 +21,7 @@
 namespace svx
 {
 
-class SVX_DLLPUBLIC ColorSet
+class ColorSet
 {
     OUString maColorSetName;
     std::vector<Color> maColors;
diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx
index 0ba2108c88ef..5b742861134c 100644
--- a/include/svx/CommonStylePreviewRenderer.hxx
+++ b/include/svx/CommonStylePreviewRenderer.hxx
@@ -26,7 +26,7 @@ class SvxFont;
 namespace svx
 {
 
-class SVX_DLLPUBLIC CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
+class CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
 {
     std::unique_ptr<SvxFont> m_pFont;
     Color maFontColor;
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index 4bb79ff6de92..401e8c8ddcbb 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -29,7 +29,7 @@ namespace vcl { class Window; }
 
 namespace svx {
 
-class SVX_DLLPUBLIC ParaULSpacingControl : public SfxToolBoxControl
+class ParaULSpacingControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -60,7 +60,7 @@ public:
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
 };
 
-class SVX_DLLPUBLIC ParaLRSpacingControl : public SfxToolBoxControl,
+class ParaLRSpacingControl : public SfxToolBoxControl,
                                     public css::ui::XContextChangeEventListener
 {
 public:
diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
index f3461212a2bf..91d7aa5f6e1f 100644
--- a/include/svx/dbcharsethelper.hxx
+++ b/include/svx/dbcharsethelper.hxx
@@ -31,7 +31,7 @@ namespace svxform { namespace charset_helper
     /** enumerates all supported charsets
         @return the number of charsets supported
     */
-    SVX_DLLPUBLIC sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
+    sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
 
 }
 }
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index c1124f106388..00b9bb58aa36 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -74,7 +74,7 @@ private:
     -   Shows the value entered/modified in the numeric field.
     -   Enables/disables/shows/hides the field according to own state changes.
  */
-class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl : public Control
+class SAL_WARN_UNUSED DialControl : public Control
 {
 public:
     explicit            DialControl( vcl::Window* pParent, WinBits nBits );
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
index e75d8186aefa..4a966122010c 100644
--- a/include/svx/legacyitem.hxx
+++ b/include/svx/legacyitem.hxx
@@ -37,21 +37,21 @@ namespace legacy
 {
     namespace SvxOrientation
     {
-        sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
-        void SVX_DLLPUBLIC Create(SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
-        SVX_DLLPUBLIC SvStream& Store(const SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+        void Create(SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        SvStream& Store(const SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
     }
     namespace SvxMargin
     {
-        sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
-        void SVX_DLLPUBLIC Create(SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
-        SVX_DLLPUBLIC SvStream& Store(const SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+        void Create(SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        SvStream& Store(const SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
     }
     namespace SvxRotateMode
     {
-        sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion);
-        void SVX_DLLPUBLIC Create(SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
-        SVX_DLLPUBLIC SvStream& Store(const SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion);
+        void Create(SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
+        SvStream& Store(const SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion);
     }
 }
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 5322a39f2f36..963b14c25075 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -146,7 +146,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
 };
 
 
-class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
+class BulletsTypeMgr final : public NBOTypeMgrBase
 {
     friend class OutlineTypeMgr;
     friend class NumberingTypeMgr;
@@ -168,7 +168,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr final : public NBOTypeMgrBase
 };
 
 
-class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
+class NumberingTypeMgr: public NBOTypeMgrBase
 {
     private:
         NumberingTypeMgr(const NumberingTypeMgr&) = delete;
@@ -187,7 +187,7 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
         static NumberingTypeMgr& GetInstance();
 };
 
-class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
+class OutlineTypeMgr: public NBOTypeMgrBase
 {
     private:
         OutlineTypeMgr(const OutlineTypeMgr&) = delete;
diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index bb87ae187007..a339f1bcecdd 100644
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -28,7 +28,7 @@ class SdrPage;
 
 namespace sdr { namespace contact {
 
-class SVX_DLLPUBLIC ViewContactOfPageObj final : public ViewContactOfSdrObj
+class ViewContactOfPageObj final : public ViewContactOfSdrObj
 {
     // Create an Object-Specific ViewObjectContact, set ViewContact and
     // ObjectContact. Always needs to return something.
diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 68559a1e2b8e..4af2540c0fd6 100644
--- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -29,7 +29,7 @@ namespace sdr { namespace contact {
 
 class PagePrimitiveExtractor;
 
-class SVX_DLLPUBLIC ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
+class ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
 {
 private:
     // the page painter helper
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 711cc8bcfabc..050893ce907f 100644
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
@@ -31,7 +31,7 @@ namespace sdr
     {
         // OverlayObjectCell - used for cell cursor, selection and AutoFill handle
 
-        class SVX_DLLPUBLIC OverlayObjectCell final : public OverlayObject
+        class OverlayObjectCell final : public OverlayObject
         {
         public:
             typedef ::std::vector< basegfx::B2DRange > RangeVector;
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index f13c507e6206..15fad54a705b 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -26,7 +26,7 @@ namespace sdr
 {
     namespace overlay
     {
-        class SVX_DLLPUBLIC OverlayTriangle final : public OverlayObjectWithBasePosition
+        class OverlayTriangle final : public OverlayObjectWithBasePosition
         {
             // second and third position in pixel
             basegfx::B2DPoint const                       maSecondPosition;
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index 4362076236ed..e6c080e751c0 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -25,7 +25,7 @@ namespace svx { namespace sidebar {
 
 /** Provide some improvements over the standard DialControl.
 */
-class SVX_DLLPUBLIC SidebarDialControl final : public svx::DialControl
+class SidebarDialControl final : public svx::DialControl
 {
 public:
     SidebarDialControl (vcl::Window* pParent, WinBits nBits);
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 0dab80d0c0d7..7965d84afd1d 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -72,7 +72,7 @@ struct CellPos
 
 
 /// TableStyleSettings
-struct SVX_DLLPUBLIC TableStyleSettings
+struct TableStyleSettings
 {
     bool mbUseFirstRow;
     bool mbUseLastRow;
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index ec7639bac3c7..e37f7f1f0e4d 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -42,7 +42,7 @@ namespace svx
 
         formerly known as SvxTbxButtonColorUpdater_Impl, residing in svx/source/tbxctrls/colorwindow.hxx.
     */
-    class SVX_DLLPUBLIC ToolboxButtonColorUpdater
+    class ToolboxButtonColorUpdater
     {
     public:
                     ToolboxButtonColorUpdater( sal_uInt16 nSlotId, sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, bool bWideButton,
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index b56ce19ba194..a6d4587dcbce 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -93,7 +93,7 @@ struct VCL_DLLPUBLIC FeatureID
     uint32_t m_aLanguageCode;
 };
 
-struct VCL_DLLPUBLIC Feature
+struct Feature
 {
     Feature();
     Feature(FeatureID const& rID, FeatureType eType);
@@ -105,7 +105,7 @@ struct VCL_DLLPUBLIC Feature
 
 // This is basically duplicates hb_feature_t to avoid including HarfBuzz
 // headers here, so the member types should remain compatible.
-struct VCL_DLLPUBLIC FeatureSetting
+struct FeatureSetting
 {
     FeatureSetting(OString feature);
 
diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx
index 083a01667b9a..a1a28d3fa241 100644
--- a/include/vcl/imagerepository.hxx
+++ b/include/vcl/imagerepository.hxx
@@ -33,7 +33,7 @@ namespace vcl
     //= ImageRepository
 
     // provides access to the application's image repository (image.zip)
-    class VCL_DLLPUBLIC ImageRepository
+    class ImageRepository
     {
     public:
         /** loads an image from the application's image repository
diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx
index 1574704158ed..45d05b5d0d3f 100644
--- a/include/vcl/mnemonicengine.hxx
+++ b/include/vcl/mnemonicengine.hxx
@@ -118,7 +118,7 @@ namespace vcl
     //= MnemonicEngine
 
     struct MnemonicEngine_Data;
-    class VCL_DLLPUBLIC MnemonicEngine
+    class MnemonicEngine
     {
         ::std::unique_ptr< MnemonicEngine_Data >  m_pData;
 
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 71a17dcc70f5..2d0701c4a859 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -54,7 +54,7 @@ struct VCL_DLLPUBLIC PPDValue
  * PPDKey - a container for the available options (=values) of a PPD keyword
  */
 
-class VCL_DLLPUBLIC PPDKey
+class PPDKey
 {
     friend class PPDParser;
     friend class CPDManager;
@@ -110,7 +110,7 @@ struct PPDKeyhash
  * PPDParser - parses a PPD file and contains all available keys from it
  */
 
-class VCL_DLLPUBLIC PPDParser
+class PPDParser
 {
     friend class PPDContext;
     friend class CUPSManager;
@@ -224,7 +224,7 @@ public:
  * contents of a PPDParser.
  */
 
-class VCL_DLLPUBLIC PPDContext
+class PPDContext
 {
     typedef std::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
     hash_type m_aCurrentValues;
diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx
index cad4a5638933..613df97ae03d 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -69,7 +69,7 @@ private:
 
 struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {};
 
-class XMLOFF_DLLPUBLIC FastTokenHandler final : public cppu::WeakImplHelper<
+class FastTokenHandler final : public cppu::WeakImplHelper<
     css::xml::sax::XFastTokenHandler >,
     public sax_fastparser::FastTokenHandlerBase
 {
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index b5fde5dfb13a..75772d24c52f 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -39,7 +39,7 @@ namespace xmlscript
 ##################################################################################################*/
 
 
-class XMLSCRIPT_DLLPUBLIC XMLElement
+class XMLElement
     : public cppu::WeakImplHelper< css::xml::sax::XAttributeList >
 {
 public: