summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-05 13:19:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-06 06:28:05 +0100
commit5d7af3c38b618d438e065da9d90668e7c4baa849 (patch)
tree4af29272478fb9f5f833307f56d892739e09829e /sw
parent7b99cdb2d77a3feaf9b782c1e656f2d922e2746e (diff)
make some classes module-private
Change-Id: I00ab3a3f6a8bbc85320e7b4fd1aa13af798e7e4c Reviewed-on: https://gerrit.libreoffice.org/82062 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/SwNodeNum.hxx2
-rw-r--r--sw/inc/SwNumberTree.hxx2
-rw-r--r--sw/inc/anchoreddrawobject.hxx2
-rw-r--r--sw/inc/charfmt.hxx2
-rw-r--r--sw/inc/chpfld.hxx2
-rw-r--r--sw/inc/dbfld.hxx2
-rw-r--r--sw/inc/dcontact.hxx2
-rw-r--r--sw/inc/docary.hxx4
-rw-r--r--sw/inc/flypos.hxx2
-rw-r--r--sw/inc/fmtcntnt.hxx2
-rw-r--r--sw/inc/swtblfmt.hxx4
-rw-r--r--sw/inc/tox.hxx2
-rw-r--r--sw/inc/unocoll.hxx2
-rw-r--r--sw/inc/unoframe.hxx2
-rw-r--r--sw/inc/usrfld.hxx2
-rw-r--r--sw/source/core/inc/bodyfrm.hxx2
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/inc/swfont.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx4
-rw-r--r--sw/source/uibase/inc/uiitems.hxx2
20 files changed, 23 insertions, 23 deletions
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;