[Libreoffice-commits] core.git: editeng/inc include/editeng include/sfx2 include/svl include/svx include/vcl sfx2/source sw/inc sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 6 05:29:57 UTC 2019
editeng/inc/unomodel.hxx | 2 +-
include/editeng/acorrcfg.hxx | 4 ++--
include/editeng/svxrtf.hxx | 2 +-
include/editeng/unoedhlp.hxx | 2 +-
include/sfx2/charwin.hxx | 2 +-
include/sfx2/templatedefaultview.hxx | 2 +-
include/sfx2/templatelocalview.hxx | 2 +-
include/sfx2/thumbnailview.hxx | 6 +++---
include/sfx2/thumbnailviewitem.hxx | 2 +-
include/svl/languageoptions.hxx | 2 +-
include/svx/dlgctl3d.hxx | 6 +++---
include/svx/fontwork.hxx | 2 +-
include/svx/itemwin.hxx | 2 +-
include/svx/numvset.hxx | 2 +-
include/svx/relfld.hxx | 2 +-
include/svx/svdpntv.hxx | 2 +-
include/svx/textchaincursor.hxx | 2 +-
include/vcl/salnativewidgets.hxx | 2 +-
include/vcl/txtattr.hxx | 2 +-
include/vcl/uitest/uiobject.hxx | 4 ++--
sfx2/source/doc/syspath.hxx | 2 +-
sw/inc/SwNodeNum.hxx | 2 +-
sw/inc/SwNumberTree.hxx | 2 +-
sw/inc/anchoreddrawobject.hxx | 2 +-
sw/inc/charfmt.hxx | 2 +-
sw/inc/chpfld.hxx | 2 +-
sw/inc/dbfld.hxx | 2 +-
sw/inc/dcontact.hxx | 2 +-
sw/inc/docary.hxx | 4 ++--
sw/inc/flypos.hxx | 2 +-
sw/inc/fmtcntnt.hxx | 2 +-
sw/inc/swtblfmt.hxx | 4 ++--
sw/inc/tox.hxx | 2 +-
sw/inc/unocoll.hxx | 2 +-
sw/inc/unoframe.hxx | 2 +-
sw/inc/usrfld.hxx | 2 +-
sw/source/core/inc/bodyfrm.hxx | 2 +-
sw/source/core/inc/frame.hxx | 2 +-
sw/source/core/inc/swfont.hxx | 2 +-
sw/source/filter/inc/wrtswtbl.hxx | 4 ++--
sw/source/uibase/inc/uiitems.hxx | 2 +-
41 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 5d7af3c38b618d438e065da9d90668e7c4baa849
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Nov 5 13:19:04 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Nov 6 06:28:05 2019 +0100
make some classes module-private
Change-Id: I00ab3a3f6a8bbc85320e7b4fd1aa13af798e7e4c
Reviewed-on: https://gerrit.libreoffice.org/82062
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/inc/unomodel.hxx b/editeng/inc/unomodel.hxx
index 4486feb163f8..90397c8ab9fc 100644
--- a/editeng/inc/unomodel.hxx
+++ b/editeng/inc/unomodel.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/implbase4.hxx>
-class EDITENG_DLLPUBLIC SvxSimpleUnoModel : public cppu::WeakAggImplHelper4<
+class SvxSimpleUnoModel : public cppu::WeakAggImplHelper4<
css::frame::XModel,
css::ucb::XAnyCompareFactory,
css::style::XStyleFamiliesSupplier,
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 407ed59df92f..900cc2601c54 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -26,7 +26,7 @@
class SvxAutoCorrect;
class SvxAutoCorrCfg;
-class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg final : public utl::ConfigItem
+class SvxBaseAutoCorrCfg final : public utl::ConfigItem
{
private:
SvxAutoCorrCfg& rParent;
@@ -43,7 +43,7 @@ public:
using ConfigItem::SetModified;
};
-class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg final : public utl::ConfigItem
+class SvxSwAutoCorrCfg final : public utl::ConfigItem
{
private:
SvxAutoCorrCfg& rParent;
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 5c070f652be7..7102fde8e925 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -290,7 +290,7 @@ public:
// The stack for the attributes:
// this class may only be used by SvxRTFParser!
-class EDITENG_DLLPUBLIC SvxRTFItemStackType
+class SvxRTFItemStackType
{
friend class SvxRTFParser;
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 459df9db01c7..24a9105453da 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -35,7 +35,7 @@ class EditEngine;
case denotes the destination position, the two parameters the
start and the end of the moved paragraph range.
*/
-class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
+class SAL_DLLPUBLIC_RTTI SvxEditSourceHint : public TextHint
{
private:
sal_Int32 mnStart;
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index 220a264a931d..06d971d0f304 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -71,7 +71,7 @@ public:
void ContextMenuSelect(const OString& rIdent);
};
-class SFX2_DLLPUBLIC SvxCharViewControl final : public Control
+class SvxCharViewControl final : public Control
{
public:
SvxCharViewControl(vcl::Window* pParent);
diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx
index 35c437e7d95c..090e8391d000 100644
--- a/include/sfx2/templatedefaultview.hxx
+++ b/include/sfx2/templatedefaultview.hxx
@@ -12,7 +12,7 @@
#include <sfx2/templatelocalview.hxx>
-class SFX2_DLLPUBLIC TemplateDefaultView final : public TemplateLocalView
+class TemplateDefaultView final : public TemplateLocalView
{
public:
TemplateDefaultView(Window *pParent);
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index f5a797f25ae5..098ffa33e6dc 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -63,7 +63,7 @@ private:
};
-class SFX2_DLLPUBLIC TemplateLocalView : public ThumbnailView
+class TemplateLocalView : public ThumbnailView
{
typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*);
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 81d16bd2eb80..b924da0f6b76 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -160,13 +160,13 @@ public:
*
**/
-class SFX2_DLLPUBLIC ThumbnailViewBase
+class ThumbnailViewBase
{
friend class ThumbnailViewAcc;
friend class ThumbnailViewItemAcc;
- SFX2_DLLPRIVATE virtual sal_uInt16 ImplGetVisibleItemCount() const = 0;
- SFX2_DLLPRIVATE virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) = 0;
+ virtual sal_uInt16 ImplGetVisibleItemCount() const = 0;
+ virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) = 0;
virtual css::uno::Reference<css::accessibility::XAccessible> getAccessible() = 0;
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index a3d1a09b1fb0..e5be46e9bb2b 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -63,7 +63,7 @@ struct ThumbnailItemAttributes
drawinglayer::attribute::FontAttribute aFontAttr;
};
-class SFX2_DLLPUBLIC ThumbnailViewItem
+class ThumbnailViewItem
{
public:
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index cfc3b4a56b6e..5fc9c8624dc4 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -112,7 +112,7 @@ public:
/** #i42730# Gives access to the Windows 16bit system locale
*/
-class SVL_DLLPUBLIC SvtSystemLanguageOptions final : public utl::ConfigItem
+class SvtSystemLanguageOptions final : public utl::ConfigItem
{
private:
OUString m_sWin16SystemLocale;
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index ed057cf20978..73cb8680a53c 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -38,7 +38,7 @@ class E3dScene;
enum class SvxPreviewObjectType { SPHERE, CUBE };
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DPreviewControl : public Control
+class SAL_WARN_UNUSED Svx3DPreviewControl : public Control
{
protected:
std::unique_ptr<FmFormModel> mpModel;
@@ -94,7 +94,7 @@ public:
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl final : public Svx3DPreviewControl
+class SAL_WARN_UNUSED Svx3DLightControl final : public Svx3DPreviewControl
{
// Callback for interactive changes
Link<Svx3DLightControl*,void> maChangeCallback;
@@ -238,7 +238,7 @@ public:
basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const;
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLightCtl3D final : public Control
+class SAL_WARN_UNUSED SvxLightCtl3D final : public Control
{
// local controls
VclPtr<Svx3DLightControl> maLightControl;
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index dd5cdfce6514..0fba454718df 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -71,7 +71,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkChildWindow final : public SfxChi
/** Floating window for setting attributes of text effects
*/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
+class SAL_WARN_UNUSED SvxFontWorkDialog : public SfxDockingWindow
{
#define CONTROLLER_COUNT 11
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index dc8b8682a98c..9701dd3328ab 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -84,7 +84,7 @@ public:
void RefreshDlgUnit();
};
-class SVX_DLLPUBLIC SvxFillTypeBox final : public FillTypeLB
+class SAL_DLLPUBLIC_RTTI SvxFillTypeBox final : public FillTypeLB
{
public:
SvxFillTypeBox( vcl::Window* pParent );
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index b73243bdc38f..12b5a83b6492 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -46,7 +46,7 @@ enum class NumberingPageType
BITMAP
};
-class SVX_DLLPUBLIC SvxNumValueSet final : public ValueSet
+class SvxNumValueSet final : public ValueSet
{
NumberingPageType ePageType;
tools::Rectangle aOrgRect;
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index d9fb5fc51f37..c7370f3159f7 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -25,7 +25,7 @@
#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SvxRelativeField final : public MetricField
+class SAL_DLLPUBLIC_RTTI SvxRelativeField final : public MetricField
{
public:
SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index bdab91676811..c1614cf8e738 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -81,7 +81,7 @@ namespace sdr
}
-class SVX_DLLPUBLIC SvxViewChangedHint final : public SfxHint
+class SvxViewChangedHint final : public SfxHint
{
public:
explicit SvxViewChangedHint();
diff --git a/include/svx/textchaincursor.hxx b/include/svx/textchaincursor.hxx
index aa56e9d5b2cb..562a24dbd8ec 100644
--- a/include/svx/textchaincursor.hxx
+++ b/include/svx/textchaincursor.hxx
@@ -30,7 +30,7 @@ enum class CursorChainingEvent;
struct ESelection;
-class SVX_DLLPUBLIC TextChainCursorManager
+class TextChainCursorManager
{
public:
TextChainCursorManager(SdrObjEditView *pEditView, const SdrTextObj *pTextObj);
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index ef333a9bd196..47ff2c8ee7ce 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -383,7 +383,7 @@ namespace o3tl
template<> struct typed_flags<TabitemFlags> : is_typed_flags<TabitemFlags, 0x0f> {};
}
-class VCL_DLLPUBLIC TabitemValue final : public ImplControlValue
+class TabitemValue final : public ImplControlValue
{
public:
TabitemFlags mnAlignment;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 4c89f97ad621..a77ad3c786b6 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -89,7 +89,7 @@ public:
FontWeight getFontWeight() const { return meWeight; }
};
-class VCL_DLLPUBLIC TextAttribProtect final : public TextAttrib
+class TextAttribProtect final : public TextAttrib
{
public:
TextAttribProtect();
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 07f4e287e211..9afbdbc5a3b4 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -266,7 +266,7 @@ private:
virtual OUString get_name() const override;
};
-class UITEST_DLLPUBLIC TabPageUIObject final : public WindowUIObject
+class TabPageUIObject final : public WindowUIObject
{
private:
VclPtr<TabPage> mxTabPage;
@@ -382,7 +382,7 @@ private:
virtual OUString get_name() const override;
};
-class UITEST_DLLPUBLIC TabControlUIObject final : public WindowUIObject
+class TabControlUIObject final : public WindowUIObject
{
private:
VclPtr<TabControl> mxTabControl;
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index 04d56218f79f..c5b1ab3039b3 100644
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
@@ -22,7 +22,7 @@
#include <sfx2/dllapi.h>
-class SFX2_DLLPUBLIC SystemPath
+class SystemPath
{
public:
static bool GetUserTemplateLocation(sal_Unicode*, int nSize);
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index cb277b7e7880..b75759912a61 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -26,7 +26,7 @@ class SwTextNode;
struct SwPosition;
class SwNumRule;
-class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
+class SwNodeNum : public SwNumberTreeNode
{
public:
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 4d2409616842..a3e6cd5d23bd 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -111,7 +111,7 @@ struct compSwNumberTreeNodeLessThan
The phantom gets numbered with the start value.
*/
-class SW_DLLPUBLIC SwNumberTreeNode
+class SwNumberTreeNode
{
protected:
typedef std::set<SwNumberTreeNode *, compSwNumberTreeNodeLessThan>
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index e6d2a802cd8c..8f383348277f 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -25,7 +25,7 @@
namespace tools { class Rectangle; }
/** class for the positioning of drawing objects */
-class SW_DLLPUBLIC SwAnchoredDrawObject final : public SwAnchoredObject
+class SwAnchoredDrawObject final : public SwAnchoredObject
{
private:
// boolean, indicating that the object position has been invalidated
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 5196a06fa5bd..76e44fe10247 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -22,7 +22,7 @@
#include "format.hxx"
#include "hintids.hxx"
-class SW_DLLPUBLIC SwCharFormat final : public SwFormat
+class SwCharFormat final : public SwFormat
{
friend class SwDoc;
friend class SwTextFormatColl;
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 4f605de8c722..34bac09bb61c 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -36,7 +36,7 @@ enum SwChapterFormat
CF_NUM_NOPREPST_TITLE, ///< chapter number without post-/prefix and title
};
-class SW_DLLPUBLIC SwChapterFieldType final : public SwFieldType
+class SwChapterFieldType final : public SwFieldType
{
public:
SwChapterFieldType();
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 34aafa04e6b2..1c0d0db2c30f 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -242,7 +242,7 @@ public:
};
// Database field.
-class SW_DLLPUBLIC SwDBNameField final : public SwDBNameInfField
+class SwDBNameField final : public SwDBNameInfField
{
public:
SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData);
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 713388c827f2..daec75ea300f 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -63,7 +63,7 @@ SwContact* GetUserCall( const SdrObject* );
bool IsMarqueeTextObj( const SdrObject& rObj );
/// Base class for the following contact objects (frame + draw objects).
-class SW_DLLPUBLIC SwContact : public SdrObjUserCall, public SwClient
+class SAL_DLLPUBLIC_RTTI SwContact : public SdrObjUserCall, public SwClient
{
/** boolean, indicating destruction of contact object
important note: boolean has to be set at the beginning of each destructor
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index de0dc00d2db4..6a8040f06a08 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -296,7 +296,7 @@ public:
};
/// Array of Undo-history.
-class SW_DLLPUBLIC SwSectionFormats final : public SwFormatsModifyBase<SwSectionFormat*>
+class SwSectionFormats final : public SwFormatsModifyBase<SwSectionFormat*>
{
public:
void dumpAsXml(xmlTextWriterPtr pWriter) const;
@@ -309,7 +309,7 @@ public:
class SwTOXTypes : public std::vector<std::unique_ptr<SwTOXType>> {};
-class SW_DLLPUBLIC SwNumRuleTable final : public SwVectorModifyBase<SwNumRule*> {
+class SwNumRuleTable final : public SwVectorModifyBase<SwNumRule*> {
public:
void dumpAsXml(xmlTextWriterPtr pWriter) const;
};
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 6c6aea5e47e0..360a5ec9ff61 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -27,7 +27,7 @@ class SwFrameFormat;
class SwNodeIndex;
/// For querying current flys in document.
-class SW_DLLPUBLIC SwPosFlyFrame final
+class SwPosFlyFrame final
{
const SwFrameFormat* m_pFrameFormat; ///< FlyFrameFormat
SwNodeIndex* m_pNodeIndex; ///< Index for node is sufficient.
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index db634b448f10..756f8f699d5e 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -28,7 +28,7 @@ class SwNodeIndex;
class SwStartNode;
/// Content, content of frame (header, footer, fly).
-class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
+class SwFormatContent: public SfxPoolItem
{
std::unique_ptr<SwNodeIndex> m_pStartNode;
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index b9070ab875e9..2d7aceb8e1a9 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -21,7 +21,7 @@
#include "frmfmt.hxx"
-class SW_DLLPUBLIC SwTableFormat final : public SwFrameFormat
+class SwTableFormat final : public SwFrameFormat
{
friend class SwDoc;
@@ -46,7 +46,7 @@ public:
virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
};
-class SW_DLLPUBLIC SwTableBoxFormat final : public SwFrameFormat
+class SwTableBoxFormat final : public SwFrameFormat
{
friend class SwDoc;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index d5248f5fee87..aecda558fcb5 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -252,7 +252,7 @@ typedef std::vector<SwFormToken> SwFormTokens;
Helper class that converts vectors of tokens to strings and vice
versa.
*/
-class SW_DLLPUBLIC SwFormTokensHelper
+class SwFormTokensHelper
{
/// the tokens
SwFormTokens m_Tokens;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 75fcdf3951ae..54ea069b3bb2 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -295,7 +295,7 @@ cppu::WeakImplHelper
css::lang::XServiceInfo
> SwXFramesBaseClass;
-class SW_DLLPUBLIC SwXFrames : public SwXFramesBaseClass,
+class SwXFrames : public SwXFramesBaseClass,
public SwUnoCollection
{
const FlyCntType m_eType;
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 3011c2422a40..074f7b814535 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -161,7 +161,7 @@ public:
void ResetDescriptor();
//copy text from a given source PaM
void SetSelection(SwPaM& rCopySource);
- static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
+ static SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
};
typedef cppu::WeakImplHelper
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index d10dc73e9143..c297ef013409 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -98,7 +98,7 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub)
* Tracks the number format and the language, conversion between the float and
* string representation is independent from the system locale.
*/
-class SW_DLLPUBLIC SwUserField final : public SwValueField
+class SwUserField final : public SwValueField
{
sal_uInt16 m_nSubType;
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index f6b046e9dd32..5bd046ec4e42 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -25,7 +25,7 @@ class SwBorderAttrs;
/// Container of body content (i.e. not header or footer). Typical parent is an
/// SwPageFrame, typical lower is an SwTextFrame.
-class SAL_DLLPUBLIC_RTTI SwBodyFrame: public SwLayoutFrame
+class SwBodyFrame: public SwLayoutFrame
{
protected:
virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5cae3ccabdc9..4f3a4afa8fbc 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -127,7 +127,7 @@ namespace drawinglayer { namespace attribute {
///
/// Added most important flags about the state of this geometric
/// information and if it is valid or not
-class SW_DLLPUBLIC SwFrameAreaDefinition
+class SwFrameAreaDefinition
{
private:
// The absolute position and size of the SwFrame in the document.
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 72b633611843..3296d93bd226 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -127,7 +127,7 @@ enum class SwFontScript
// mostly used as a "unknown script" marker
#define SW_SCRIPTS (SwFontScript(int(SwFontScript::LAST)+1))
-class SW_DLLPUBLIC SwFont
+class SwFont
{
// CJK == Chinese, Japanese, Korean
// CTL == Complex text layout ( Hebrew, Arabic )
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 623ddeeda5c4..99c970d57b1c 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -93,7 +93,7 @@ public:
typedef std::vector<std::unique_ptr<SwWriteTableCell>> SwWriteTableCells;
-class SW_DLLPUBLIC SwWriteTableRow final
+class SwWriteTableRow final
{
SwWriteTableCells m_Cells; ///< all cells of the rows
const SvxBrushItem *pBackground; // background
@@ -154,7 +154,7 @@ inline bool SwWriteTableRow::operator<( const SwWriteTableRow& rRow ) const
using SwWriteTableRows
= o3tl::sorted_vector< std::unique_ptr<SwWriteTableRow>, o3tl::less_uniqueptr_to<SwWriteTableRow> >;
-class SW_DLLPUBLIC SwWriteTableCol
+class SwWriteTableCol
{
sal_uInt32 const nPos; // end position of the column
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index e317006e1ba4..81fa94e16f76 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -90,7 +90,7 @@ public:
SwNumRule* GetNumRule() { return pRule.get(); }
};
-class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem
+class SwPaMItem : public SfxPoolItem
{
SwPaM* const m_pPaM;
More information about the Libreoffice-commits
mailing list