sw/CppunitTest_sw_core_frmedt.mk | 1
sw/inc/anchoredobject.hxx | 6 +-
sw/inc/calbck.hxx | 2
sw/inc/dbmgr.hxx | 46 +++++++++----------
sw/inc/ndarr.hxx | 12 ++---
sw/inc/ndgrf.hxx | 10 ++--
sw/inc/ndnotxt.hxx | 12 ++---
sw/inc/node.hxx | 18 +++----
sw/inc/numrule.hxx | 22 ++++-----
sw/inc/redline.hxx | 16 +++---
sw/inc/reffld.hxx | 20 ++++----
sw/inc/swcrsr.hxx | 14 +++---
sw/inc/swmodule.hxx | 28 ++++++------
sw/inc/swrect.hxx | 2
sw/inc/swtable.hxx | 20 ++++----
sw/inc/viewopt.hxx | 18 +++----
sw/inc/viewsh.hxx | 88 +++++++++++++++++++-------------------
sw/rtfexport_setup.mk | 1
sw/source/core/inc/flyfrm.hxx | 10 ++--
sw/source/core/inc/frame.hxx | 16 +++---
sw/source/core/inc/ftnboss.hxx | 6 +-
sw/source/core/inc/layfrm.hxx | 6 +-
sw/source/core/inc/rootfrm.hxx | 10 ++--
sw/source/core/text/porlay.hxx | 4 -
sw/source/filter/html/wrthtml.hxx | 4 -
sw/source/uibase/inc/edtwin.hxx | 12 ++---
sw/source/uibase/inc/frmmgr.hxx | 22 ++++-----
sw/source/uibase/inc/swdtflvr.hxx | 16 +++---
28 files changed, 222 insertions(+), 220 deletions(-)
New commits:
commit 0ed1cb5457a2106316f9d7fda10685360db4bc30
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 21 12:42:19 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 5 18:33:33 2024 +0100
make more symbols private in writer
Change-Id: I2c4745910fc3654f2021e77f9fa590d3da3464ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163749
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/CppunitTest_sw_core_frmedt.mk b/sw/CppunitTest_sw_core_frmedt.mk
index 6e2cd5bc9760..c2e2436fd1d2 100644
--- a/sw/CppunitTest_sw_core_frmedt.mk
+++ b/sw/CppunitTest_sw_core_frmedt.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_frmedt, \
comphelper \
cppu \
cppuhelper \
+ editeng \
sal \
sfx \
subsequenttest \
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 48b192f69ba9..837d25dcb77d 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -41,7 +41,7 @@ enum class RndStdIds;
of Writer fly frames (derived classes of <SwFlyFrame>) and of drawing
objects
(derived classes of <SwAnchoredDrawObject>).
*/
-class SW_DLLPUBLIC SwAnchoredObject
+class SAL_DLLPUBLIC_RTTI SwAnchoredObject
{
private:
// drawing object representing the anchored object in the drawing layer
@@ -214,7 +214,7 @@ class SW_DLLPUBLIC SwAnchoredObject
and the anchor character frame for an at-character and as-character
anchored object.
*/
- SwFrame* GetAnchorFrameContainingAnchPos();
+ SW_DLLPUBLIC SwFrame* GetAnchorFrameContainingAnchPos();
SwPageFrame* GetPageFrame() { return mpPageFrame; }
const SwPageFrame* GetPageFrame() const { return mpPageFrame; }
@@ -336,7 +336,7 @@ class SW_DLLPUBLIC SwAnchoredObject
virtual void UpdateLayoutDir();
/** method to determine object area inclusive its spacing */
- const SwRect& GetObjRectWithSpaces() const;
+ SW_DLLPUBLIC const SwRect& GetObjRectWithSpaces() const;
void InvalidateObjRectWithSpaces() const
{
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 0538ea99265c..f4133a2853fa 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -101,7 +101,7 @@ namespace sw
SvtBroadcaster& GetNotifier() { return m_aNotifier; }
};
/// refactoring out the same of the more sane SwClient functionality
- class SW_DLLPUBLIC WriterListener
+ class SAL_DLLPUBLIC_RTTI WriterListener
{
friend class ::SwModify;
friend class ::sw::ClientIteratorBase;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 4c6a0c1e7499..9693eee95c74 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -238,10 +238,10 @@ struct SwMergeDescriptor
class SwDoc;
-class SW_DLLPUBLIC SwDBManager
+class SwDBManager
{
struct SwDBManager_Impl;
- class SAL_DLLPRIVATE ConnectionDisposedListener_Impl;
+ class ConnectionDisposedListener_Impl;
class MailDispatcherListener_Impl;
enum class MergeStatus
@@ -271,22 +271,22 @@ class SW_DLLPUBLIC SwDBManager
/// The document that owns this manager.
SwDoc* m_pDoc;
- SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, bool
bCreate);
- SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString&
rSource, bool bCreate);
+ SwDSParam* FindDSData(const SwDBData& rData, bool bCreate);
+ SwDSParam* FindDSConnection(const OUString& rSource, bool
bCreate);
/// Insert data record as text into document.
- SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh);
+ void ImportFromConnection( SwWrtShell* pSh);
/// Insert a single data record as text into document.
- SAL_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
+ void ImportDBEntry(SwWrtShell* pSh);
/// Run the mail merge for defined modes, except DBMGR_MERGE
- SAL_DLLPRIVATE bool MergeMailFiles( SwWrtShell* pSh,
+ bool MergeMailFiles( SwWrtShell* pSh,
const SwMergeDescriptor&
rMergeDescriptor );
- SAL_DLLPRIVATE bool ToNextMergeRecord();
- SAL_DLLPRIVATE bool IsValidMergeRecord() const;
- SAL_DLLPRIVATE void ImplDestroy();
+ bool ToNextMergeRecord();
+ bool IsValidMergeRecord() const;
+ void ImplDestroy();
SwDBManager(SwDBManager const&) = delete;
SwDBManager& operator=(SwDBManager const&) = delete;
@@ -309,19 +309,19 @@ public:
bool IsMergeOk() const { return MergeStatus::Ok ==
m_aMergeStatus; }
bool IsMergeError() const { return MergeStatus::Error <=
m_aMergeStatus; }
- static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView
const * pView);
+ SW_DLLPUBLIC static std::shared_ptr<SwMailMergeConfigItem>
PerformMailMerge(SwView const * pView);
/// Initialize data fields that lack name of database.
bool IsInitDBFields() const { return m_bInitDBFields; }
void SetInitDBFields(bool b) { m_bInitDBFields = b; }
/// Fill listbox with all table names of a database.
- bool GetTableNames(weld::ComboBox& rBox, const OUString&
rDBName);
+ SW_DLLPUBLIC bool GetTableNames(weld::ComboBox& rBox, const OUString&
rDBName);
/// Fill listbox with all column names of a database table.
- void GetColumnNames(weld::ComboBox& rBox,
+ SW_DLLPUBLIC void GetColumnNames(weld::ComboBox& rBox,
const OUString& rDBName, const OUString&
rTableName);
- static void GetColumnNames(weld::ComboBox& rBox,
+ SW_DLLPUBLIC static void GetColumnNames(weld::ComboBox& rBox,
css::uno::Reference< css::sdbc::XConnection> const
& xConnection,
const OUString& rTableName);
@@ -381,7 +381,7 @@ public:
static const SwDBData& GetAddressDBName();
- static OUString GetDBField(
+ SW_DLLPUBLIC static OUString GetDBField(
css::uno::Reference< css::beans::XPropertySet > const &
xColumnProp,
const SwDBFormatData& rDBFormatData,
double *pNumber = nullptr);
@@ -391,12 +391,12 @@ public:
css::uno::Reference< css::sdbc::XDataSource>& rxSource,
const SwView* pView);
- static css::uno::Reference< css::sdbcx::XColumnsSupplier>
+ SW_DLLPUBLIC static css::uno::Reference< css::sdbcx::XColumnsSupplier>
GetColumnSupplier(css::uno::Reference< css::sdbc::XConnection>
const & xConnection,
const OUString& rTableOrQuery,
SwDBSelect eTableOrQuery =
SwDBSelect::UNKNOWN);
- static css::uno::Sequence<OUString> GetExistingDatabaseNames();
+ SW_DLLPUBLIC static css::uno::Sequence<OUString>
GetExistingDatabaseNames();
/**
Loads a data source from file and registers it.
@@ -405,7 +405,7 @@ public:
the filename returned by a file picker and additional settings dialog.
In case of success it returns the registered name, otherwise an empty
string.
*/
- static OUString LoadAndRegisterDataSource(weld::Window*
pParent, SwDocShell* pDocShell = nullptr);
+ SW_DLLPUBLIC static OUString LoadAndRegisterDataSource(weld::Window*
pParent, SwDocShell* pDocShell = nullptr);
/**
Loads a data source from file and registers it.
@@ -413,13 +413,13 @@ public:
Convenience function, which calls GetDBunoURI and has just one mandatory
parameter.
In case of success it returns the registered name, otherwise an empty
string.
*/
- static OUString LoadAndRegisterDataSource(std::u16string_view
rURI, const OUString *pDestDir);
+ SW_DLLPUBLIC static OUString LoadAndRegisterDataSource(std::u16string_view
rURI, const OUString *pDestDir);
/// Load the embedded data source of the document and also register it.
void LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const
SwDocShell& rDocShell);
/// Unregister a data source.
- static void RevokeDataSource(const OUString& rName);
+ SW_DLLPUBLIC static void RevokeDataSource(const OUString& rName);
/** try to get the data source from the given connection through the
XChild interface.
If this is not possible, the data source will be created through its
name.
@@ -446,7 +446,7 @@ public:
The new created RowSet.
*/
- static css::uno::Reference< css::sdbc::XResultSet>
+ SW_DLLPUBLIC static css::uno::Reference< css::sdbc::XResultSet>
createCursor(const OUString& _sDataSourceName,
const OUString& _sCommand,
sal_Int32 _nCommandType,
@@ -467,10 +467,10 @@ public:
void releaseRevokeListener();
/// Revoke not committed registrations in case of mail merge cancel
- void RevokeLastRegistrations();
+ SW_DLLPUBLIC void RevokeLastRegistrations();
/// Accept not committed registrations
- void CommitLastRegistrations();
+ SW_DLLPUBLIC void CommitLastRegistrations();
/// Remove not used connections.
void RevokeNotUsedConnections();
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index a3fabe828d19..886384aca288 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -86,7 +86,7 @@ public:
struct SwTableToTextSave;
using SwTableToTextSaves = std::vector<std::unique_ptr<SwTableToTextSave>>;
-class SW_DLLPUBLIC SwNodes final
+class SwNodes final
: private BigPtrArray
{
friend class SwDoc;
@@ -166,7 +166,7 @@ public:
/** Is the NodesArray the regular one of Doc? (and not the UndoNds, ...)
Implementation in doc.hxx (because one needs to know Doc for it) ! */
- bool IsDocNodes() const;
+ SW_DLLPUBLIC bool IsDocNodes() const;
static sal_uInt16 GetSectionLevel(const SwNode &rIndex);
void Delete(const SwNodeIndex &rPos, SwNodeOffset nNodes =
SwNodeOffset(1));
@@ -186,7 +186,7 @@ public:
static void GoStartOfSection(SwNodeIndex *);
static void GoEndOfSection(SwNodeIndex *);
- static SwContentNode* GoNext(SwNodeIndex*);
+ SW_DLLPUBLIC static SwContentNode* GoNext(SwNodeIndex*);
static SwContentNode* GoNext(SwPosition*);
static SwContentNode* GoPrevious(SwNodeIndex *, bool canCrossBoundary =
false);
static SwContentNode* GoPrevious(SwPosition *, bool canCrossBoundary =
false);
@@ -209,10 +209,10 @@ public:
SwStartNodeType = SwNormalStartNode );
/// Implementations of "Make...Node" are in the given .cxx-files.
- SwTextNode *MakeTextNode( SwNode& rWhere,
+ SW_DLLPUBLIC SwTextNode *MakeTextNode( SwNode& rWhere,
SwTextFormatColl *pColl,
bool bNewFrames = true); ///< in ndtxt.cxx
- SwStartNode* MakeTextSection( const SwNode & rWhere,
+ SW_DLLPUBLIC SwStartNode* MakeTextSection( const SwNode & rWhere,
SwStartNodeType eSttNdTyp,
SwTextFormatColl *pColl );
@@ -279,7 +279,7 @@ public:
/** Insert a new box in the line before InsPos. Its format
is taken from the following one (or from the previous one if we are
at the end). In the line there must be a box already. */
- bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*,
+ SW_DLLPUBLIC bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*,
/// Formats for TextNode of box.
SwTextFormatColl*, const SfxItemSet* pAutoAttr,
sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 93673990fff8..872fc7feff92 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -32,7 +32,7 @@ class SwGrfFormatColl;
class SwDoc;
// SwGrfNode
-class SW_DLLPUBLIC SwGrfNode final: public SwNoTextNode
+class SAL_DLLPUBLIC_RTTI SwGrfNode final: public SwNoTextNode
{
friend class SwNodes;
@@ -71,8 +71,8 @@ class SW_DLLPUBLIC SwGrfNode final: public SwNoTextNode
public:
virtual ~SwGrfNode() override;
- const Graphic& GetGrf(bool bWait = false) const;
- const GraphicObject& GetGrfObj(bool bWait = false) const;
+ SW_DLLPUBLIC const Graphic& GetGrf(bool bWait = false) const;
+ SW_DLLPUBLIC const GraphicObject& GetGrfObj(bool bWait = false) const;
const GraphicObject* GetReplacementGrfObj() const;
/// isolated only way to set GraphicObject to allow more actions when
doing so
@@ -84,7 +84,7 @@ public:
{ maGrfObj.StartAnimation(*pOut, rPt, rSz, nRendererId,
pFirstFrameOutDev); }
void StopGraphicAnimation(const OutputDevice* pOut, tools::Long
nRendererId) { maGrfObj.StopAnimation(pOut, nRendererId); }
- virtual Size GetTwipSize() const override;
+ SW_DLLPUBLIC virtual Size GetTwipSize() const override;
void SetTwipSize( const Size& rSz );
bool IsTransparent() const;
@@ -127,7 +127,7 @@ public:
bool IsLinkedFile() const;
bool IsLinkedDDE() const;
const tools::SvRef<SwBaseLink>& GetLink() const { return mxLink; }
- bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const;
+ SW_DLLPUBLIC bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm
) const;
void ReleaseLink();
/** Scale an image-map: the image-map becomes zoomed in / out by
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index b9e53ef4c080..9829ce7d2375 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -26,7 +26,7 @@
class Size;
/// Layout frame for SwNoTextNode, i.e. graphics and OLE nodes (including
charts).
-class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
+class SAL_DLLPUBLIC_RTTI SwNoTextNode : public SwContentNode
{
friend class SwNodes;
friend class SwNoTextFrame;
@@ -61,14 +61,14 @@ public:
virtual bool SavePersistentData();
virtual bool RestorePersistentData();
- OUString GetTitle() const;
+ SW_DLLPUBLIC OUString GetTitle() const;
void SetTitle( const OUString& rTitle );
- OUString GetDescription() const;
+ SW_DLLPUBLIC OUString GetDescription() const;
void SetDescription( const OUString& rDescription );
- void SetContour( const tools::PolyPolygon *pPoly,
+ SW_DLLPUBLIC void SetContour( const tools::PolyPolygon *pPoly,
bool bAutomatic = false );
- const tools::PolyPolygon *HasContour() const;
+ SW_DLLPUBLIC const tools::PolyPolygon *HasContour() const;
bool HasContour_() const { return bool(m_pContour); };
void GetContour( tools::PolyPolygon &rPoly ) const;
void CreateContour();
@@ -88,7 +88,7 @@ public:
bool IsContourMapModeValid() const { return
m_bContourMapModeValid; }
// Obtains the graphic with SwapIn for GrfNode via GetData for OLE.
- Graphic GetGraphic() const;
+ SW_DLLPUBLIC Graphic GetGraphic() const;
};
// Inline methods from Node.hxx - we know TextNode only here!!
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b1e3309d596f..ec17dd6aa78c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -391,7 +391,7 @@ class SwEndNode final : public SwNode
// SwContentNode
-class SW_DLLPUBLIC SwContentNode: public sw::BroadcastingModify, public
SwNode, public SwContentIndexReg
+class SAL_DLLPUBLIC_RTTI SwContentNode: public sw::BroadcastingModify, public
SwNode, public SwContentIndexReg
{
sw::WriterMultiListener m_aCondCollListener;
@@ -430,23 +430,23 @@ public:
virtual SwContentNode *JoinNext();
/** Is it possible to join two nodes?
In pIdx the second position can be returned. */
- bool CanJoinNext( SwNodeIndex* pIdx = nullptr ) const;
+ SW_DLLPUBLIC bool CanJoinNext( SwNodeIndex* pIdx = nullptr ) const;
bool CanJoinNext( SwPosition* pIdx ) const;
- bool CanJoinPrev( SwNodeIndex* pIdx =nullptr ) const;
+ SW_DLLPUBLIC bool CanJoinPrev( SwNodeIndex* pIdx =nullptr ) const;
bool GoNext(SwContentIndex *, SwCursorSkipMode nMode ) const;
bool GoNext(SwPosition*, SwCursorSkipMode nMode ) const;
bool GoPrevious(SwContentIndex *, SwCursorSkipMode nMode ) const;
/// @see GetFrameOfModify
- SwContentFrame *getLayoutFrame( const SwRootFrame*,
+ SW_DLLPUBLIC SwContentFrame *getLayoutFrame( const SwRootFrame*,
const SwPosition *pPos = nullptr,
std::pair<Point, bool> const* pViewPosAndCalcFrame = nullptr)
const;
/** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
- SwRect FindLayoutRect( const bool bPrtArea = false,
+ SW_DLLPUBLIC SwRect FindLayoutRect( const bool bPrtArea = false,
const Point* pPoint = nullptr ) const;
- SwRect FindPageFrameRect() const;
+ SW_DLLPUBLIC SwRect FindPageFrameRect() const;
/** Method creates all views of document for given node. The content
frames that are created are put in the respective layout. */
@@ -473,16 +473,16 @@ public:
template<class T>
const T& GetAttr( TypedWhichId<T> nWhich, bool bInParent=true ) const
{ return static_cast<const T&>(GetAttr(sal_uInt16(nWhich), bInParent)); }
- bool GetAttr( SfxItemSet& rSet ) const;
+ SW_DLLPUBLIC bool GetAttr( SfxItemSet& rSet ) const;
/// made virtual
- virtual bool SetAttr( const SfxPoolItem& );
+ SW_DLLPUBLIC virtual bool SetAttr( const SfxPoolItem& );
virtual bool SetAttr( const SfxItemSet& rSet );
virtual bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
virtual bool ResetAttr( const std::vector<sal_uInt16>& rWhichArr );
virtual sal_uInt16 ResetAllAttr();
/// Obtains attribute that is not delivered via conditional style!
- const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, bool bInParents )
const;
+ SW_DLLPUBLIC const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, bool
bInParents ) const;
template<class T>
const T* GetNoCondAttr( TypedWhichId<T> nWhich, bool bInParents ) const
{ return static_cast<const T*>(GetNoCondAttr(sal_uInt16(nWhich),
bInParents)); }
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index aaa09236c8e4..b9a30ec55546 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -90,7 +90,7 @@ public:
};
enum SwNumRuleType { OUTLINE_RULE = 0, NUM_RULE = 1, RULE_END = 2 };
-class SW_DLLPUBLIC SwNumRule
+class SwNumRule
{
public:
@@ -142,31 +142,31 @@ private:
public:
/// add parameter <eDefaultNumberFormatPositionAndSpaceMode>
- SwNumRule( OUString aNm,
+ SW_DLLPUBLIC SwNumRule( OUString aNm,
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode,
SwNumRuleType = NUM_RULE );
- SwNumRule( const SwNumRule& );
- ~SwNumRule();
+ SW_DLLPUBLIC SwNumRule( const SwNumRule& );
+ SW_DLLPUBLIC ~SwNumRule();
- SwNumRule& operator=( const SwNumRule& );
- bool operator==( const SwNumRule& ) const;
+ SW_DLLPUBLIC SwNumRule& operator=( const SwNumRule& );
+ SW_DLLPUBLIC bool operator==( const SwNumRule& ) const;
bool operator!=( const SwNumRule& r ) const { return !(*this == r); }
void Reset( const OUString& rName );
- const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
- const SwNumFormat& Get( sal_uInt16 i ) const;
+ SW_DLLPUBLIC const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
+ SW_DLLPUBLIC const SwNumFormat& Get( sal_uInt16 i ) const;
bool IsHidden( ) const { return mbHidden; }
void SetHidden( bool bValue ) { mbHidden = bValue; }
void Set( sal_uInt16 i, const SwNumFormat* );
- void Set( sal_uInt16 i, const SwNumFormat& );
+ SW_DLLPUBLIC void Set( sal_uInt16 i, const SwNumFormat& );
OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true ) const;
/** - add optional parameter <_nRestrictToThisLevel> in order to
restrict returned string to this level. */
- OUString MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
+ SW_DLLPUBLIC OUString MakeNumString( const SwNumberTree::tNumberVector &
rNumVector,
const bool bInclStrings = true,
const unsigned int _nRestrictToThisLevel = MAXLEVEL,
const bool bHideNonNumerical = false,
@@ -272,7 +272,7 @@ public:
void Validate(const SwDoc& rDoc);
void dumpAsXml(xmlTextWriterPtr w) const;
- void GetGrabBagItem(css::uno::Any& rVal) const;
+ SW_DLLPUBLIC void GetGrabBagItem(css::uno::Any& rVal) const;
void SetGrabBagItem(const css::uno::Any& rVal);
};
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index c54b7d5d8380..a8be390b1490 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -163,7 +163,7 @@ public:
void dumpAsXml(xmlTextWriterPtr pWriter) const;
};
-class SW_DLLPUBLIC SwRangeRedline final : public SwPaM
+class SAL_DLLPUBLIC_RTTI SwRangeRedline final : public SwPaM
{
SwRedlineData* m_pRedlineData;
std::optional<SwNodeIndex> m_oContentSect;
@@ -180,8 +180,8 @@ class SW_DLLPUBLIC SwRangeRedline final : public SwPaM
public:
static sal_uInt32 s_nLastId;
- SwRangeRedline( RedlineType eType, const SwPaM& rPam, sal_uInt32 nMoveID =
0 );
- SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam );
+ SW_DLLPUBLIC SwRangeRedline( RedlineType eType, const SwPaM& rPam,
sal_uInt32 nMoveID = 0 );
+ SW_DLLPUBLIC SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam
);
SwRangeRedline( const SwRedlineData& rData, const SwPosition& rPos );
// For sw3io: pData is taken over!
SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos,
@@ -210,18 +210,18 @@ public:
/// Do we have a valid selection?
bool HasValidRange() const;
- const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0) const;
+ SW_DLLPUBLIC const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0)
const;
bool operator!=( const SwRedlineData& rCmp ) const
{ return *m_pRedlineData != rCmp; }
void SetAutoFormat() { m_pRedlineData->SetAutoFormat(); }
bool IsAutoFormat() const { return m_pRedlineData->IsAutoFormat(); }
sal_uInt16 GetStackCount() const;
- std::size_t GetAuthor( sal_uInt16 nPos = 0) const;
- OUString const & GetAuthorString( sal_uInt16 nPos = 0 ) const;
+ SW_DLLPUBLIC std::size_t GetAuthor( sal_uInt16 nPos = 0) const;
+ SW_DLLPUBLIC OUString const & GetAuthorString( sal_uInt16 nPos = 0 ) const;
sal_uInt32 GetMovedID(sal_uInt16 nPos = 0) const;
const DateTime& GetTimeStamp(sal_uInt16 nPos = 0) const;
- RedlineType GetType( sal_uInt16 nPos = 0 ) const;
+ SW_DLLPUBLIC RedlineType GetType( sal_uInt16 nPos = 0 ) const;
// text content of the redline is only an annotation placeholder
// (i.e. a comment, but don't confuse it with comment of the redline)
bool IsAnnotation() const;
@@ -277,7 +277,7 @@ public:
bSimplified = simplified shortened text to show deletions on margin
*/
- OUString GetDescr(bool bSimplified = false);
+ SW_DLLPUBLIC OUString GetDescr(bool bSimplified = false);
bool operator<( const SwRangeRedline& ) const;
void dumpAsXml(xmlTextWriterPtr pWriter) const;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 2059ad309e87..8eb293184c6d 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -103,7 +103,7 @@ public:
void UpdateStyleReferences();
};
-class SW_DLLPUBLIC SwGetRefField final : public SwField
+class SAL_DLLPUBLIC_RTTI SwGetRefField final : public SwField
{
private:
OUString m_sSetRefName;
@@ -118,10 +118,10 @@ private:
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override;
virtual std::unique_ptr<SwField> Copy() const override;
public:
- SwGetRefField( SwGetRefFieldType*, OUString aSetRef, OUString
aReferenceLanguage,
+ SW_DLLPUBLIC SwGetRefField( SwGetRefFieldType*, OUString aSetRef, OUString
aReferenceLanguage,
sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uInt16 nFlags,
sal_uLong nFormat );
- virtual ~SwGetRefField() override;
+ SW_DLLPUBLIC virtual ~SwGetRefField() override;
virtual OUString GetFieldName() const override;
@@ -142,14 +142,14 @@ public:
/// Get/set sub type.
virtual sal_uInt16 GetSubType() const override;
- virtual void SetSubType( sal_uInt16 n ) override;
+ SW_DLLPUBLIC virtual void SetSubType( sal_uInt16 n ) override;
// --> #i81002#
- bool IsRefToHeadingCrossRefBookmark() const;
- bool IsRefToNumItemCrossRefBookmark() const;
- const SwTextNode* GetReferencedTextNode(SwTextNode* pTextNode, SwFrame*
pFrame) const;
+ SW_DLLPUBLIC bool IsRefToHeadingCrossRefBookmark() const;
+ SW_DLLPUBLIC bool IsRefToNumItemCrossRefBookmark() const;
+ SW_DLLPUBLIC const SwTextNode* GetReferencedTextNode(SwTextNode*
pTextNode, SwFrame* pFrame) const;
// #i85090#
- OUString GetExpandedTextOfReferencedTextNode(SwRootFrame const& rLayout,
SwTextNode* pTextNode, SwFrame* pFrame) const;
+ SW_DLLPUBLIC OUString GetExpandedTextOfReferencedTextNode(SwRootFrame
const& rLayout, SwTextNode* pTextNode, SwFrame* pFrame) const;
/// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD).
sal_uInt16 GetSeqNo() const { return m_nSeqNo; }
@@ -160,10 +160,10 @@ public:
void SetFlags( sal_uInt16 n ) { m_nFlags = n; }
// Name of reference.
- virtual OUString GetPar1() const override;
+ SW_DLLPUBLIC virtual OUString GetPar1() const override;
virtual void SetPar1(const OUString& rStr) override;
- virtual OUString GetPar2() const override;
+ SW_DLLPUBLIC virtual OUString GetPar2() const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId )
const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16
nWhichId ) override;
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 570780080f5e..0dcd5944a90b 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -67,7 +67,7 @@ namespace o3tl {
template<> struct typed_flags<SwCursorSkipMode> :
is_typed_flags<SwCursorSkipMode, 0x3> {};
}
-class SW_DLLPUBLIC SwCursor : public SwPaM
+class SAL_DLLPUBLIC_RTTI SwCursor : public SwPaM
{
friend class SwCursorSaveState;
@@ -93,8 +93,8 @@ protected:
public:
// single argument ctors shall be explicit.
- SwCursor( const SwPosition &rPos, SwPaM* pRing );
- virtual ~SwCursor() override;
+ SW_DLLPUBLIC SwCursor( const SwPosition &rPos, SwPaM* pRing );
+ SW_DLLPUBLIC virtual ~SwCursor() override;
inline SwCursor & operator =(SwCursor const &);
@@ -114,7 +114,7 @@ public:
SwPaM* ) const;
// note: DO NOT call it FindText because windows.h
- sal_Int32 Find_Text( const i18nutil::SearchOptions2& rSearchOpt,
+ SW_DLLPUBLIC sal_Int32 Find_Text( const i18nutil::SearchOptions2&
rSearchOpt,
bool bSearchInNotes,
SwDocPositions nStart, SwDocPositions nEnd,
bool& bCancel,
@@ -166,7 +166,7 @@ public:
bool UpDown(bool bUp, sal_uInt16 nCnt, Point const * pPt, tools::Long
nUpDownX, SwRootFrame & rLayout);
bool LeftRightMargin(SwRootFrame const& rLayout, bool bLeftMargin, bool
bAPI);
bool IsAtLeftRightMargin(SwRootFrame const& rLayout, bool bLeftMargin,
bool bAPI) const;
- bool SttEndDoc( bool bSttDoc );
+ SW_DLLPUBLIC bool SttEndDoc( bool bSttDoc );
bool GoPrevNextCell( bool bNext, sal_uInt16 nCnt );
bool Left( sal_uInt16 nCnt ) { return LeftRight(true, nCnt,
SwCursorSkipMode::Chars, false/*bAllowVisual*/, false/*bSkipHidden*/, false,
nullptr, false); }
@@ -176,12 +176,12 @@ public:
virtual bool GotoTable( const OUString& rName );
bool GotoTableBox( const OUString& rName );
bool GotoRegion( std::u16string_view rName );
- bool GotoFootnoteAnchor();
+ SW_DLLPUBLIC bool GotoFootnoteAnchor();
bool GotoFootnoteText();
bool GotoNextFootnoteAnchor();
bool GotoPrevFootnoteAnchor();
- bool MovePara( SwWhichPara, SwMoveFnCollection const & );
+ SW_DLLPUBLIC bool MovePara( SwWhichPara, SwMoveFnCollection const & );
bool MoveSection( SwWhichSection, SwMoveFnCollection const & );
bool MoveTable( SwWhichTable, SwMoveFnCollection const & );
bool MoveRegion( SwWhichRegion, SwMoveFnCollection const & );
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index b485bdd53693..2e5687171955 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -70,7 +70,7 @@ namespace com::sun::star::linguistic2 { class
XLanguageGuessing; }
namespace com::sun::star::linguistic2 { class XLinguServiceEventListener; }
namespace ooo::vba { class XSinkCaller; }
-class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener,
public utl::ConfigurationListener
+class SAL_DLLPUBLIC_RTTI SwModule final : public SfxModule, public
SfxListener, public utl::ConfigurationListener
{
OUString m_sActAuthor;
@@ -146,33 +146,33 @@ public:
// Handler for slots.
void StateOther(SfxItemSet &);
- void ExecOther(SfxRequest &); // Fields, formula...
+ SW_DLLPUBLIC void ExecOther(SfxRequest &); // Fields, formula...
// Modify user settings.
- const SwMasterUsrPref *GetUsrPref(bool bWeb) const;
+ SW_DLLPUBLIC const SwMasterUsrPref *GetUsrPref(bool bWeb) const;
const SwViewOption* GetViewOption(bool bWeb);
- void ApplyUsrPref(const SwViewOption &, SwView*,
+ SW_DLLPUBLIC void ApplyUsrPref(const SwViewOption &, SwView*,
SvViewOpt nDest = SvViewOpt::DestView );
void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb );
- void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags);
- void ApplyLinkMode(sal_Int32 nNewLinkMode);
+ SW_DLLPUBLIC void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags);
+ SW_DLLPUBLIC void ApplyLinkMode(sal_Int32 nNewLinkMode);
// Default page mode for text grid.
- void ApplyDefaultPageMode(bool bIsSquaredPageMode);
+ SW_DLLPUBLIC void ApplyDefaultPageMode(bool bIsSquaredPageMode);
void ApplyUserCharUnit(bool bApplyChar, bool bWeb); // apply_char_unit
// Create ConfigItems.
SwModuleOptions* GetModuleConfig() { return
m_pModuleConfig.get();}
SwPrintOptions* GetPrtOptions(bool bWeb);
- SwChapterNumRules* GetChapterNumRules();
+ SW_DLLPUBLIC SwChapterNumRules* GetChapterNumRules();
SwStdFontConfig* GetStdFontConfig() { return
m_pStdFontConfig.get(); }
SwNavigationConfig* GetNavigationConfig();
SwToolbarConfigItem*GetToolbarConfig() { return
m_pToolbarConfig.get(); }
SwToolbarConfigItem*GetWebToolbarConfig() { return
m_pWebToolbarConfig.get(); }
- SwDBConfig* GetDBConfig();
- svtools::ColorConfig& GetColorConfig();
+ SW_DLLPUBLIC SwDBConfig* GetDBConfig();
+ SW_DLLPUBLIC svtools::ColorConfig& GetColorConfig();
SvtUserOptions& GetUserOptions();
// Iterate over views.
@@ -193,8 +193,8 @@ public:
// Redlining.
std::size_t GetRedlineAuthor();
- OUString const & GetRedlineAuthor(std::size_t nPos);
- void ClearRedlineAuthors();
+ SW_DLLPUBLIC OUString const & GetRedlineAuthor(std::size_t nPos);
+ SW_DLLPUBLIC void ClearRedlineAuthors();
/// See SwXTextDocument::getTrackedChangeAuthors().
void GetRedlineAuthorInfo(tools::JsonWriter& rJsonWriter);
std::size_t InsertRedlineAuthor(const OUString& rAuthor);
@@ -226,7 +226,7 @@ public:
virtual std::optional<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
) override;
virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId,
weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&
rSet ) override;
- virtual std::optional<SfxStyleFamilies> CreateStyleFamilies() override;
+ SW_DLLPUBLIC virtual std::optional<SfxStyleFamilies> CreateStyleFamilies()
override;
// Pool is created here and set at SfxShell.
void InitAttrPool();
@@ -243,7 +243,7 @@ public:
css::uno::Reference< css::linguistic2::XLanguageGuessing > const &
GetLanguageGuesser();
- void RegisterAutomationApplicationEventsCaller(css::uno::Reference<
ooo::vba::XSinkCaller > const& xCaller);
+ SW_DLLPUBLIC void
RegisterAutomationApplicationEventsCaller(css::uno::Reference<
ooo::vba::XSinkCaller > const& xCaller);
void CallAutomationApplicationEventSinks(const OUString& Method,
css::uno::Sequence< css::uno::Any >& Arguments);
};
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index eeb02df23c95..3365434abb07 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -31,7 +31,7 @@ typedef struct _xmlTextWriter* xmlTextWriterPtr;
/// This is half-open so m_Point.X() + m_Size.getWidth() is *not* included.
/// Note the tools Rectangle is (usually? sometimes?) closed so there's a
/// SVRect() to subtract 1 for the conversion.
-class SAL_WARN_UNUSED SW_DLLPUBLIC SwRect
+class SAL_WARN_UNUSED SwRect
{
Point m_Point;
Size m_Size;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 69138709ebac..ffa9e88a0ce0 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -109,7 +109,7 @@ using SwTableBoxes = std::vector<SwTableBox*>;
class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {};
/// SwTable is one table in the document model, containing rows (which contain
cells).
-class SW_DLLPUBLIC SwTable: public SwClient //Client of FrameFormat.
+class SAL_DLLPUBLIC_RTTI SwTable: public SwClient //Client of
FrameFormat.
{
protected:
@@ -209,9 +209,9 @@ public:
SwTableFormat* GetFrameFormat() { return
static_cast<SwTableFormat*>(GetRegisteredIn()); }
SwTableFormat* GetFrameFormat() const { return
const_cast<SwTableFormat*>(static_cast<const
SwTableFormat*>(GetRegisteredIn())); }
- void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
+ SW_DLLPUBLIC void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
bool bHidden = false, bool bCurRowOnly = false ) const;
- void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
+ SW_DLLPUBLIC void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
const SwTableBox *pStart, bool bCurRowOnly );
// The following functions are for new table model only...
@@ -280,7 +280,7 @@ public:
// #i80314#
// add 2nd parameter in order to control validation check in called method
// <GetBoxNum(..)>
- const SwTableBox* GetTableBox( const OUString& rName,
+ SW_DLLPUBLIC const SwTableBox* GetTableBox( const OUString& rName,
const bool bPerformValidCheck = false ) const;
// Copy selected boxes to another document.
bool MakeCopy( SwDoc&, const SwPosition&, const SwSelBoxes&,
@@ -301,7 +301,7 @@ public:
{ return const_cast<SwTable*>(this)->GetTableBox(
nSttIdx ); }
// Returns true if table contains nestings.
- bool IsTableComplex() const;
+ SW_DLLPUBLIC bool IsTableComplex() const;
// Returns true if table or selection is balanced.
bool IsTableComplexForChart( std::u16string_view aSel ) const;
@@ -309,14 +309,14 @@ public:
// Search all content-bearing boxes of the base line on which this box
stands.
// rBoxes as a return value for immediate use.
// bToTop = true -> up to base line, false-> else only line of box.
- static SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
+ SW_DLLPUBLIC static SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
SwSelBoxes& rBoxes, bool bToTop = true );
// Get information from client.
virtual bool GetInfo( SfxPoolItem& ) const override;
// Search in format for registered table.
- static SwTable * FindTable( SwFrameFormat const*const pFormat );
+ SW_DLLPUBLIC static SwTable * FindTable( SwFrameFormat const*const pFormat
);
// Clean up structure of subtables a bit:
// convert row with 1 box with subtable; box with subtable with 1 row;
@@ -324,7 +324,7 @@ public:
void GCLines();
// Returns the table node via m_TabSortContentBoxes or pTableNode.
- SwTableNode* GetTableNode() const;
+ SW_DLLPUBLIC SwTableNode* GetTableNode() const;
void SetTableNode( SwTableNode* pNode ) { m_pTableNode = pNode; }
// Data server methods.
@@ -347,7 +347,7 @@ public:
void CheckConsistency() const;
#endif
- bool HasLayout() const;
+ SW_DLLPUBLIC bool HasLayout() const;
bool CanConvertSubtables() const;
void ConvertSubtables();
@@ -355,7 +355,7 @@ public:
// is it a table deleted completely with change tracking
bool IsDeleted() const;
// is it a table with a deleted row or cell
- bool HasDeletedRowOrCell() const;
+ SW_DLLPUBLIC bool HasDeletedRowOrCell() const;
// it doesn't contain box content (except single empty nested tables of
the boxes
// which could remain after deletion of text content of the selected table)
bool IsEmpty() const;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index d58c361e24c9..e32fea4975db 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -244,7 +244,7 @@ struct SwViewColors
ViewOptFlags m_nAppearanceFlags;
};
-class SW_DLLPUBLIC SwViewOption
+class SwViewOption
{
SwViewColors m_aColorConfig;
static SwViewColors s_aInitialColorConfig;
@@ -301,9 +301,9 @@ class SW_DLLPUBLIC SwViewOption
#endif
public:
- SwViewOption(); // CTOR
- SwViewOption(const SwViewOption&);
- ~SwViewOption();
+ SW_DLLPUBLIC SwViewOption(); // CTOR
+ SW_DLLPUBLIC SwViewOption(const SwViewOption&);
+ SW_DLLPUBLIC ~SwViewOption();
static void Init(const OutputDevice* pWin); // Initializing of
static data.
@@ -482,7 +482,7 @@ public:
{ m_nCoreOptions.bUseHeaderFooterMenu = b; }
//show/hide outline content visibility button
- bool IsShowOutlineContentVisibilityButton() const;
+ SW_DLLPUBLIC bool IsShowOutlineContentVisibilityButton() const;
void SetShowOutlineContentVisibilityButton(bool b)
{ m_nCoreOptions.bShowOutlineContentVisibilityButton = b; }
@@ -830,8 +830,8 @@ public:
bool IsShowPlaceHolderFields() const { return
m_bShowPlaceHolderFields; }
void SetShowPlaceHolderFields(bool bSet) {
m_bShowPlaceHolderFields = bSet; }
- const Color& GetDocColor() const;
- const Color& GetDocBoundariesColor() const;
+ SW_DLLPUBLIC const Color& GetDocColor() const;
+ SW_DLLPUBLIC const Color& GetDocBoundariesColor() const;
const Color& GetAppBackgroundColor() const;
const Color& GetObjectBoundariesColor() const;
const Color& GetTableBoundariesColor() const;
@@ -843,7 +843,7 @@ public:
const Color& GetGrammarColor() const;
const Color& GetSmarttagColor() const;
const Color& GetShadowColor() const;
- const Color& GetFontColor() const;
+ SW_DLLPUBLIC const Color& GetFontColor() const;
const Color& GetFieldShadingsColor() const;
const Color& GetSectionBoundColor() const;
const Color& GetPageBreakColor() const;
@@ -882,7 +882,7 @@ public:
void dumpAsXml(xmlTextWriterPtr pWriter) const;
// Useful for when getting the current view SwViewOption is not possible
otherwise
- static const SwViewOption& GetCurrentViewOptions();
+ SW_DLLPUBLIC static const SwViewOption& GetCurrentViewOptions();
void SyncLayoutRelatedViewOptions(const SwViewOption& rOpt);
};
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 9318c51196fe..a55da3bc1f69 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -107,7 +107,7 @@ struct SwVisiblePageNumbers
class SwView;
-class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
+class SAL_DLLPUBLIC_RTTI SwViewShell : public sw::Ring<SwViewShell>
{
friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
friend void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pOut,
@@ -169,27 +169,27 @@ class SW_DLLPUBLIC SwViewShell : public
sw::Ring<SwViewShell>
SwRootFramePtr mpLayout;
// Initialization; called by the diverse constructors.
- SAL_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
+ void Init( const SwViewOption *pNewOpt );
inline void ResetInvalidRect();
- SAL_DLLPRIVATE void PaintDesktop(const vcl::RenderContext& rRenderContext,
const SwRect&); // Collect values for painting of desktop
+ void PaintDesktop(const vcl::RenderContext& rRenderContext, const
SwRect&); // Collect values for painting of desktop
// and calling.
// PaintDesktop split. This pars is also used by PreviewPage.
- SAL_DLLPRIVATE void PaintDesktop_(const SwRegionRects &rRegion);
+ void PaintDesktop_(const SwRegionRects &rRegion);
- SAL_DLLPRIVATE bool CheckInvalidForPaint( const SwRect & ); // Direct
Paint or rather
+ bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather
// trigger
an action.
- SAL_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions, bool
bIsPDFExport = false );
+ void PrepareForPrint( const SwPrintData &rOptions, bool bIsPDFExport =
false );
- SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
+ void ImplApplyViewOptions( const SwViewOption &rOpt );
- SAL_DLLPRIVATE void InvalidateAll(std::vector<LockPaintReason>& rReasons);
+ void InvalidateAll(std::vector<LockPaintReason>& rReasons);
- SAL_DLLPRIVATE void InvalidatePageAndHFSubsidiaryLines();
+ void InvalidatePageAndHFSubsidiaryLines();
protected:
static ShellResource* spShellRes; ///< Resources for the Shell.
@@ -219,9 +219,9 @@ public:
// Bracketing of actions belonging together.
inline void StartAction();
- void ImplStartAction();
+ SW_DLLPUBLIC void ImplStartAction();
inline void EndAction( const bool bIdleEnd = false );
- void ImplEndAction( const bool bIdleEnd );
+ SW_DLLPUBLIC void ImplEndAction( const bool bIdleEnd );
sal_uInt16 ActionCount() const { return mnStartAction; }
bool ActionPend() const { return mnStartAction != 0; }
bool IsInEndAction() const { return mbInEndAction; }
@@ -241,7 +241,7 @@ public:
void FlushPendingLOKInvalidateTiles();
/// Invalidates complete Layout (ApplyViewOption).
- void Reformat();
+ SW_DLLPUBLIC void Reformat();
// #i72754# set of Pre/PostPaints with lock counter and initial target
OutDev
protected:
@@ -295,33 +295,33 @@ public:
// Invalidate first visible page for all Shells in ring.
void SetFirstVisPageInvalid();
- SwRootFrame *GetLayout() const;
+ SW_DLLPUBLIC SwRootFrame* GetLayout() const;
bool IsNewLayout() const; // Has Layout been loaded or created?
Size GetDocSize() const; // Get document size.
virtual void CalcLayout(); // Force complete formatting of layout.
- sal_uInt16 GetPageCount() const;
+ SW_DLLPUBLIC sal_uInt16 GetPageCount() const;
- Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const;
+ SW_DLLPUBLIC Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages )
const;
SwDoc *GetDoc() const { return mxDoc.get(); } //Never 0.
/** Provides access to the document setting interface
*/
const IDocumentSettingAccess& getIDocumentSettingAccess() const;
- IDocumentSettingAccess& getIDocumentSettingAccess();
+ SW_DLLPUBLIC IDocumentSettingAccess& getIDocumentSettingAccess();
/** Provides access to the document device interface
*/
const IDocumentDeviceAccess& getIDocumentDeviceAccess() const;
- IDocumentDeviceAccess& getIDocumentDeviceAccess();
+ SW_DLLPUBLIC IDocumentDeviceAccess& getIDocumentDeviceAccess();
/** Provides access to the document bookmark interface
*/
const IDocumentMarkAccess* getIDocumentMarkAccess() const;
- IDocumentMarkAccess* getIDocumentMarkAccess();
+ SW_DLLPUBLIC IDocumentMarkAccess* getIDocumentMarkAccess();
/** Provides access to the document draw model interface
*/
@@ -336,7 +336,7 @@ public:
/** Provides access to the document layout interface
*/
const IDocumentLayoutAccess& getIDocumentLayoutAccess() const;
- IDocumentLayoutAccess& getIDocumentLayoutAccess();
+ SW_DLLPUBLIC IDocumentLayoutAccess& getIDocumentLayoutAccess();
/** Provides access to the content operations interface
*/
@@ -344,7 +344,7 @@ public:
/** Provides access to the document style pool interface
*/
- IDocumentStylePoolAccess& getIDocumentStylePoolAccess();
+ SW_DLLPUBLIC IDocumentStylePoolAccess& getIDocumentStylePoolAccess();
/** Provides access to the document statistics interface
*/
@@ -355,8 +355,8 @@ public:
IDocumentUndoRedo const& GetIDocumentUndoRedo() const;
IDocumentUndoRedo & GetIDocumentUndoRedo();
- const IDocumentListItems* getIDocumentListItemsAccess() const;
- const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess() const;
+ SW_DLLPUBLIC const IDocumentListItems* getIDocumentListItemsAccess() const;
+ SW_DLLPUBLIC const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess()
const;
// 1. GetRefDev: Either the printer or the virtual device from the doc
// 2. GetWin: Available if we not printing
@@ -396,11 +396,11 @@ public:
void CalcPagesForPrint( sal_uInt16 nMax );
// All about fields.
- void UpdateFields(bool bCloseDB = false);
+ SW_DLLPUBLIC void UpdateFields(bool bCloseDB = false);
bool IsAnyFieldInDoc() const;
/// Update the previews of all OLE objects.
- void UpdateOleObjectPreviews();
+ SW_DLLPUBLIC void UpdateOleObjectPreviews();
// Update all charts, for that exists any table.
void UpdateAllCharts();
@@ -409,43 +409,43 @@ public:
// DOCUMENT COMPATIBILITY FLAGS START
// Add or maximize paragraph spacing?
- void SetParaSpaceMax( bool bNew );
+ SW_DLLPUBLIC void SetParaSpaceMax( bool bNew );
// Add or maximize paragraph spacing?
- void SetParaSpaceMaxAtPages( bool bNew );
+ SW_DLLPUBLIC void SetParaSpaceMaxAtPages( bool bNew );
// Compatible behaviour of tabs.
- void SetTabCompat( bool bNew );
+ SW_DLLPUBLIC void SetTabCompat( bool bNew );
// Font metric attribute "External Leading" should be considered.
- void SetAddExtLeading( bool bNew );
+ SW_DLLPUBLIC void SetAddExtLeading( bool bNew );
// Adding paragraph and table spacing at bottom
// of table cells.
- void SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells );
+ SW_DLLPUBLIC void SetAddParaSpacingToTableCells( bool
_bAddParaSpacingToTableCells );
// Former formatting of text lines with
// proportional line spacing or not.
- void SetUseFormerLineSpacing( bool _bUseFormerLineSpacing );
+ SW_DLLPUBLIC void SetUseFormerLineSpacing( bool _bUseFormerLineSpacing );
// Former object positioning.
- void SetUseFormerObjectPositioning( bool _bUseFormerObjPos );
+ SW_DLLPUBLIC void SetUseFormerObjectPositioning( bool _bUseFormerObjPos );
- void SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos );
+ SW_DLLPUBLIC void SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos );
- void SetUseFormerTextWrapping( bool _bUseFormerTextWrapping );
+ SW_DLLPUBLIC void SetUseFormerTextWrapping( bool _bUseFormerTextWrapping );
- void SetDoNotJustifyLinesWithManualBreak( bool
_bDoNotJustifyLinesWithManualBreak );
+ SW_DLLPUBLIC void SetDoNotJustifyLinesWithManualBreak( bool
_bDoNotJustifyLinesWithManualBreak );
- void SetProtectForm( bool _bProtectForm );
+ SW_DLLPUBLIC void SetProtectForm( bool _bProtectForm );
- void SetMsWordCompTrailingBlanks( bool _bMsWordCompTrailingBlanks );
+ SW_DLLPUBLIC void SetMsWordCompTrailingBlanks( bool
_bMsWordCompTrailingBlanks );
- void SetSubtractFlysAnchoredAtFlys(bool bSubtractFlysAnchoredAtFlys);
+ SW_DLLPUBLIC void SetSubtractFlysAnchoredAtFlys(bool
bSubtractFlysAnchoredAtFlys);
- void SetEmptyDbFieldHidesPara(bool bEmptyDbFieldHidesPara);
+ SW_DLLPUBLIC void SetEmptyDbFieldHidesPara(bool bEmptyDbFieldHidesPara);
- void SetNoGapAfterNoteNumber(bool bNew);
+ SW_DLLPUBLIC void SetNoGapAfterNoteNumber(bool bNew);
// DOCUMENT COMPATIBILITY FLAGS END
@@ -463,10 +463,10 @@ public:
const SwAccessibilityOptions* GetAccessibilityOptions() const { return
mpAccOptions.get();}
static void SetShellRes( ShellResource* pRes ) { spShellRes =
pRes; }
- static ShellResource* GetShellRes();
+ SW_DLLPUBLIC static ShellResource* GetShellRes();
static weld::Window* CareChildWin(SwViewShell const & rVSh);
- static void SetCareDialog(const std::shared_ptr<weld::Window>&
rNew);
+ SW_DLLPUBLIC static void SetCareDialog(const
std::shared_ptr<weld::Window>& rNew);
static weld::Window* GetCareDialog(SwViewShell const & rVSh)
{ return (*spCareDialog.get()) ?
spCareDialog.get()->get() : CareChildWin(rVSh); }
@@ -507,7 +507,7 @@ public:
bool HasDrawViewDrag() const;
// DrawView may be used at UI.
- SdrView *GetDrawView();
+ SW_DLLPUBLIC SdrView *GetDrawView();
const SdrView *GetDrawView() const { return
const_cast<SwViewShell*>(this)->GetDrawView(); }
// Take care that MarkList is up-to-date in any case (Bug 57153).
@@ -515,7 +515,7 @@ public:
// Query attribute pool.
inline const SfxItemPool& GetAttrPool() const;
- SfxItemPool& GetAttrPool();
+ SW_DLLPUBLIC SfxItemPool& GetAttrPool();
bool IsPreview() const { return mbPreview; }
@@ -584,7 +584,7 @@ public:
void DeleteReplacementBitmaps();
const SwPostItMgr* GetPostItMgr() const { return
const_cast<SwViewShell*>(this)->GetPostItMgr(); }
- SwPostItMgr* GetPostItMgr();
+ SW_DLLPUBLIC SwPostItMgr* GetPostItMgr();
/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
void ToggleHeaderFooterEdit();
diff --git a/sw/rtfexport_setup.mk b/sw/rtfexport_setup.mk
index a2a1c7109cca..2577778b0e1e 100644
--- a/sw/rtfexport_setup.mk
+++ b/sw/rtfexport_setup.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport$(1), \
cppu \
cppuhelper \
docmodel \
+ editeng \
i18nlangtag \
sal \
sfx \
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index c695fe07c75a..821be741fc70 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -76,7 +76,7 @@ namespace o3tl {
#i26791# - inherit also from <SwAnchoredFlyFrame>
*/
-class SW_DLLPUBLIC SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject
+class SAL_DLLPUBLIC_RTTI SwFlyFrame : public SwLayoutFrame, public
SwAnchoredObject
{
// is allowed to lock, implemented in frmtool.cxx
friend void AppendObj(SwFrame *const pFrame, SwPageFrame *const pPage,
SwFrameFormat *const pFormat, const SwFormatAnchor & rAnch);
@@ -284,7 +284,7 @@ public:
// (This is in order to skip on the otherwise necessary casting of the
result to
// 'SwFlyFrameFormat *' after calls to this function. The casting is now
done in this function.)
virtual const SwFlyFrameFormat *GetFormat() const override;
- virtual SwFlyFrameFormat *GetFormat() override;
+ SW_DLLPUBLIC virtual SwFlyFrameFormat *GetFormat() override;
virtual void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
@@ -296,15 +296,15 @@ public:
void InvalidateContentPos();
void SelectionHasChanged(SwFEShell* pShell);
- bool IsShowUnfloatButton(SwWrtShell* pWrtSh) const;
+ SW_DLLPUBLIC bool IsShowUnfloatButton(SwWrtShell* pWrtSh) const;
// For testing only (see uiwriter)
- void ActiveUnfloatButton(SwWrtShell* pWrtSh);
+ SW_DLLPUBLIC void ActiveUnfloatButton(SwWrtShell* pWrtSh);
virtual const SwFlyFrame* DynCastFlyFrame() const override;
virtual SwFlyFrame* DynCastFlyFrame() override;
- SwFlyAtContentFrame* DynCastFlyAtContentFrame();
+ SW_DLLPUBLIC SwFlyAtContentFrame* DynCastFlyAtContentFrame();
private:
void UpdateUnfloatButton(SwWrtShell* pWrtSh, bool bShow) const;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 65f392b3eadc..eac4adff7ce6 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -311,7 +311,7 @@ namespace o3tl {
* level: pages, headers, footers, etc. (Inside a paragraph SwLinePortion
* instances are used.)
*/
-class SW_DLLPUBLIC SwFrame : public SwFrameAreaDefinition, public SwClient,
public SfxBroadcaster
+class SAL_DLLPUBLIC_RTTI SwFrame : public SwFrameAreaDefinition, public
SwClient, public SfxBroadcaster
{
// the hidden Frame
friend class SwFlowFrame;
@@ -608,7 +608,7 @@ public:
inline void ResetRetouche() const;
bool IsRetouche() const { return mbRetouche; }
- void SetInfFlags();
+ SW_DLLPUBLIC void SetInfFlags();
void InvalidateInfFlags() { mbInfInvalid = true; }
inline bool IsInDocBody() const; // use InfoFlags, determine flags
inline bool IsInFootnote() const; // if necessary
@@ -687,13 +687,13 @@ public:
SwFrame *FindColFrame();
SwRowFrame *FindRowFrame();
SwFootnoteBossFrame *FindFootnoteBossFrame( bool bFootnotes = false );
- SwTabFrame *ImplFindTabFrame();
+ SW_DLLPUBLIC SwTabFrame *ImplFindTabFrame();
SwFootnoteFrame *ImplFindFootnoteFrame();
SwFlyFrame *ImplFindFlyFrame();
SwSectionFrame *ImplFindSctFrame();
const SwBodyFrame *ImplFindBodyFrame() const;
SwFrame *FindFooterOrHeader();
- SwFrame *GetLower();
+ SW_DLLPUBLIC SwFrame *GetLower();
const SwFrame *GetNext() const { return mpNext; }
const SwFrame *GetPrev() const { return mpPrev; }
const SwLayoutFrame *GetUpper() const { return mpUpper; }
@@ -735,7 +735,7 @@ public:
const SwFrame* GetIndNext() const { return
const_cast<SwFrame*>(this)->GetIndNext(); }
sal_uInt16 GetPhyPageNum() const; // page number without offset
- sal_uInt16 GetVirtPageNum() const; // page number with offset
+ SW_DLLPUBLIC sal_uInt16 GetVirtPageNum() const; // page number with offset
bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
bool WannaRightPage() const;
bool OnFirstPage() const;
@@ -752,7 +752,7 @@ public:
// PaintArea is the area where content might be displayed.
// The margin of a page or the space between columns belongs to it.
- SwRect GetPaintArea() const;
+ SW_DLLPUBLIC SwRect GetPaintArea() const;
// UnionFrame is the union of Frame- and PrtArea, normally identical
// to the FrameArea except in case of negative Prt margins.
@@ -875,9 +875,9 @@ public:
inline bool IsCellFrame() const;
inline bool IsContentFrame() const;
inline bool IsTextFrame() const;
- SwTextFrame* DynCastTextFrame();
+ SW_DLLPUBLIC SwTextFrame* DynCastTextFrame();
const SwTextFrame* DynCastTextFrame() const;
- SwPageFrame* DynCastPageFrame();
+ SW_DLLPUBLIC SwPageFrame* DynCastPageFrame();
const SwPageFrame* DynCastPageFrame() const;
inline bool IsNoTextFrame() const;
// Frames where its PrtArea depends on their neighbors and that are
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 109c9df74e29..172225bfda06 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -46,7 +46,7 @@ enum class SwNeighbourAdjust {
typedef std::vector<SwFootnoteFrame*> SwFootnoteFrames;
-class SW_DLLPUBLIC SwFootnoteBossFrame: public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwFootnoteBossFrame: public SwLayoutFrame
{
// for private footnote operations
friend class SwFrame;
@@ -73,7 +73,7 @@ public:
, m_nMaxFootnoteHeight(0)
{}
- SwLayoutFrame *FindBodyCont();
+ SW_DLLPUBLIC SwLayoutFrame *FindBodyCont();
inline const SwLayoutFrame *FindBodyCont() const;
void SetMaxFootnoteHeight( const SwTwips nNewMax ) { m_nMaxFootnoteHeight
= nNewMax; }
@@ -81,7 +81,7 @@ public:
void AppendFootnote( SwContentFrame *, SwTextFootnote * );
bool RemoveFootnote(const SwContentFrame *, const SwTextFootnote *, bool
bPrep = true);
static SwFootnoteFrame *FindFootnote( const SwContentFrame *,
const SwTextFootnote * );
- SwFootnoteContFrame *FindFootnoteCont();
+ SW_DLLPUBLIC SwFootnoteContFrame *FindFootnoteCont();
inline const SwFootnoteContFrame *FindFootnoteCont() const;
const SwFootnoteFrame *FindFirstFootnote( SwContentFrame const
* ) const;
SwFootnoteContFrame *FindNearestFootnoteCont( bool bDontLeave
= false );
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 4774257d3a63..bd2c446125b8 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -32,7 +32,7 @@ class SwFormatFrameSize;
class SwCellFrame;
/// A layout frame is a frame that contains other frames (m_pLower), e.g.
SwPageFrame or SwTabFrame.
-class SW_DLLPUBLIC SwLayoutFrame: public SwFrame
+class SAL_DLLPUBLIC_RTTI SwLayoutFrame: public SwFrame
{
// The SwFrame in disguise
friend class SwFlowFrame;
@@ -100,7 +100,7 @@ public:
const SwFrame *Lower() const { return m_pLower; }
SwFrame *Lower() { return m_pLower; }
bool ContainsDeleteForbiddenLayFrame() const;
- const SwContentFrame *ContainsContent() const;
+ SW_DLLPUBLIC const SwContentFrame *ContainsContent() const;
inline SwContentFrame *ContainsContent();
const SwCellFrame *FirstCell() const;
inline SwCellFrame *FirstCell();
@@ -165,7 +165,7 @@ public:
*/
bool IsBefore( const SwLayoutFrame* _pCheckRefLayFrame ) const;
- const SwFrame* GetLastLower() const;
+ SW_DLLPUBLIC const SwFrame* GetLastLower() const;
inline SwFrame* GetLastLower();
virtual void PaintBreak() const;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 5938bcfc7a4d..96c5d0843f57 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -82,7 +82,7 @@ using SwFlyDestroyList = o3tl::sorted_vector<SwFlyFrame*>;
/// The root element of a Writer document layout. Lower frames are expected to
/// be SwPageFrame instances.
-class SW_DLLPUBLIC SwRootFrame final : public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwRootFrame final : public SwLayoutFrame
{
// Needs to disable the Superfluous temporarily
friend void AdjustSizeChgNotify( SwRootFrame *pRoot );
@@ -237,10 +237,10 @@ public:
SdrPage* GetDrawPage() { return mpDrawPage; }
void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; }
- virtual bool GetModelPositionForViewPoint( SwPosition *, Point&,
+ SW_DLLPUBLIC virtual bool GetModelPositionForViewPoint( SwPosition *,
Point&,
SwCursorMoveState* = nullptr, bool
bTestBackground = false ) const override;
- virtual void PaintSwFrame( vcl::RenderContext& rRenderContext, SwRect
const& ) const override;
+ SW_DLLPUBLIC virtual void PaintSwFrame( vcl::RenderContext&
rRenderContext, SwRect const& ) const override;
virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo =
false ) override;
virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo =
false ) override;
#ifdef DBG_UTIL
@@ -434,13 +434,13 @@ public:
* (this is layout-level redline hiding).
*/
bool IsHideRedlines() const { return mbHideRedlines; }
- void SetHideRedlines(bool);
+ SW_DLLPUBLIC void SetHideRedlines(bool);
sw::FieldmarkMode GetFieldmarkMode() const { return m_FieldmarkMode; }
void SetFieldmarkMode(sw::FieldmarkMode, sw::ParagraphBreakMode);
sw::ParagraphBreakMode GetParagraphBreakMode() const { return
m_ParagraphBreakMode; }
bool HasMergedParas() const;
- void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
+ SW_DLLPUBLIC void dumpAsXml(xmlTextWriterPtr writer = nullptr) const
override;
};
inline tools::Long SwRootFrame::GetBrowseWidth() const
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 52c4f856095f..6da1895d0161 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -75,7 +75,7 @@ public:
/// Collection of SwLinePortion instances, representing one line of text.
/// Typically owned by an SwParaPortion.
-class SW_DLLPUBLIC SwLineLayout : public SwTextPortion
+class SwLineLayout : public SwTextPortion
{
private:
SwLineLayout *m_pNext; // The next Line
@@ -114,7 +114,7 @@ public:
// From SwLinePortion
virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override;
virtual SwLinePortion *Append( SwLinePortion *pPortion ) override;
- SwLinePortion *GetFirstPortion() const;
+ SW_DLLPUBLIC SwLinePortion *GetFirstPortion() const;
// Flags
void ResetFlags();
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index 51bd462d08d3..9b0d145cad86 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -269,7 +269,7 @@ enum class Css1Background
};
}
-class SW_DLLPUBLIC SwHTMLWriter : public Writer
+class SwHTMLWriter : public Writer
{
SwHTMLPosFlyFrames m_aHTMLPosFlyFrames;
std::unique_ptr<SwHTMLNumRuleInfo> m_pNumRuleInfo;// current numbering
@@ -441,7 +441,7 @@ public:
/// Construct an instance of SwHTMLWriter and optionally give it
/// the filter options directly, which can also be set via
SetupFilterOptions().
- explicit SwHTMLWriter( const OUString& rBaseURL, std::u16string_view
rFilterOptions = std::u16string_view() );
+ SW_DLLPUBLIC explicit SwHTMLWriter( const OUString& rBaseURL,
std::u16string_view rFilterOptions = std::u16string_view() );
virtual ~SwHTMLWriter() override;
void Out_SwDoc( SwPaM* ); // write the marked range
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ec2df846c8ee..a40e6d03d322 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -56,7 +56,7 @@ class SwTextFrame;
To translate the pixel positions from the buffer OutputDevice to the real
pixel positions, use the PixelToLogic methods of this class.
*/
-class SW_DLLPUBLIC SwEditWin final : public vcl::DocWindow,
+class SwEditWin final : public vcl::DocWindow,
public DropTargetHelper, public DragSourceHelper
{
friend class SwEditWinUIObject;
@@ -161,16 +161,16 @@ class SW_DLLPUBLIC SwEditWin final : public
vcl::DocWindow,
* The selection is regularly increased towards the mouse
* position.
*/
- DECL_DLLPRIVATE_LINK( TimerHandler, Timer *, void );
+ DECL_LINK( TimerHandler, Timer *, void );
void StartDDTimer();
void StopDDTimer(SwWrtShell *, const Point &);
- DECL_DLLPRIVATE_LINK( DDHandler, Timer *, void );
+ DECL_LINK( DDHandler, Timer *, void );
// timer for ANY-KeyInut question without a following KeyInputEvent
- DECL_DLLPRIVATE_LINK( KeyInputFlushHandler, Timer *, void );
+ DECL_LINK( KeyInputFlushHandler, Timer *, void );
// timer for ApplyTemplates via mouse (in disguise Drag&Drop)
- DECL_DLLPRIVATE_LINK( TemplateTimerHdl, Timer *, void );
+ DECL_LINK( TemplateTimerHdl, Timer *, void );
void MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
const bool bOnlyText, bool bLockView );
@@ -207,7 +207,7 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::DocWindow,
bool IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType&
rControl, bool& bOverFly, bool& bPageAnchored ) const;
public:
- virtual void KeyInput(const KeyEvent &rKEvt) override;
+ SW_DLLPUBLIC virtual void KeyInput(const KeyEvent &rKEvt) override;
void UpdatePointer(const Point &, sal_uInt16 nButtons = 0);
bool IsDrawSelMode() const;
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 70e66d9bf139..ed77c2322bfb 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -47,7 +47,7 @@ enum class Frmmgr_Type
ENVELP = 0x10
};
-class SW_DLLPUBLIC SwFlyFrameAttrMgr
+class SwFlyFrameAttrMgr
{
SfxItemSet m_aSet;
Point m_aAbsPos;
@@ -60,18 +60,18 @@ class SW_DLLPUBLIC SwFlyFrameAttrMgr
bool m_bIsInVerticalL2R;
// internal calculation for borders
- SAL_DLLPRIVATE SwTwips CalcTopSpace();
- SAL_DLLPRIVATE SwTwips CalcBottomSpace();
- SAL_DLLPRIVATE SwTwips CalcLeftSpace();
- SAL_DLLPRIVATE SwTwips CalcRightSpace();
+ SwTwips CalcTopSpace();
+ SwTwips CalcBottomSpace();
+ SwTwips CalcLeftSpace();
+ SwTwips CalcRightSpace();
- SAL_DLLPRIVATE void UpdateFlyFrame_(); // post-treatment after insert or
update
+ void UpdateFlyFrame_(); // post-treatment after insert or update
public:
- SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nType, const
SvGlobalName* pName );
+ SW_DLLPUBLIC SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type
nType, const SvGlobalName* pName );
//CopyCtor for dialogs to check the metrics
- SwFlyFrameAttrMgr( bool bNew, SwWrtShell *pSh, SfxItemSet aSet );
+ SW_DLLPUBLIC SwFlyFrameAttrMgr( bool bNew, SwWrtShell *pSh, SfxItemSet
aSet );
void SetAnchor(RndStdIds eId);
inline RndStdIds GetAnchor() const;
@@ -109,12 +109,12 @@ public:
// create new frame
void InsertFlyFrame();
- void InsertFlyFrame(RndStdIds eAnchorType,
+ SW_DLLPUBLIC void InsertFlyFrame(RndStdIds eAnchorType,
const Point &rPos,
const Size &rSize);
// check and change metrics
- void ValidateMetrics(SvxSwFrameValidation& rVal,
+ SW_DLLPUBLIC void ValidateMetrics(SvxSwFrameValidation& rVal,
const SwFormatAnchor* pToCharContentPos,
bool bOnlyPercentRefValue = false);
@@ -126,7 +126,7 @@ public:
void SetAttrSet(const SfxItemSet& rSet);
void SetFrameSizeFromTable();
/// Checks if we have a table selection and that covers exactly 1 full
table.
- static const SwTableFormat* SingleTableSelected(SwWrtShell& rWrtShell);
+ SW_DLLPUBLIC static const SwTableFormat* SingleTableSelected(SwWrtShell&
rWrtShell);
inline const SwFormatVertOrient &GetVertOrient() const;
inline const SwFormatHoriOrient &GetHoriOrient() const;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx
b/sw/source/uibase/inc/swdtflvr.hxx
index 18c9bc0c44b9..ce42a13bd010 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -75,7 +75,7 @@ enum class PasteTableType
class SwTransferDdeLink;
-class SW_DLLPUBLIC SwTransferable final : public TransferableHelper
+class SwTransferable final : public TransferableHelper
{
friend class SwView_Impl;
SfxObjectShellLock m_aDocShellRef;
@@ -168,7 +168,7 @@ class SW_DLLPUBLIC SwTransferable final : public
TransferableHelper
using TransferableHelper::StartDrag;
public:
- SwTransferable( SwWrtShell& );
+ SW_DLLPUBLIC SwTransferable( SwWrtShell& );
virtual ~SwTransferable() override;
static SotExchangeDest GetSotDestination( const SwWrtShell& rSh );
@@ -178,8 +178,8 @@ public:
static void InitOle( SfxObjectShell* pDoc );
// copy - methods and helper methods for the copy
- int Cut();
- int Copy( bool bIsCut = false );
+ SW_DLLPUBLIC int Cut();
+ SW_DLLPUBLIC int Copy( bool bIsCut = false );
int PrepareForCopy( bool bIsCut = false );
void PrepareForCopyTextRange(SwPaM & rPaM);
void CalculateAndCopy(); // special for Calculator
@@ -192,7 +192,7 @@ public:
// paste - methods and helper methods for the paste
static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& );
- static bool Paste( SwWrtShell&, TransferableDataHelper&, RndStdIds
nAnchorType = RndStdIds::FLY_AT_PARA,
+ SW_DLLPUBLIC static bool Paste( SwWrtShell&, TransferableDataHelper&,
RndStdIds nAnchorType = RndStdIds::FLY_AT_PARA,
bool bIgnoreComments = false, PasteTableType
ePasteTable = PasteTableType::PASTE_DEFAULT );
static bool PasteData( const TransferableDataHelper& rData,
SwWrtShell& rSh, sal_uInt8 nAction,
SotExchangeActionFlags nActionFlags,
@@ -215,7 +215,7 @@ public:
* @param rFormatUsed
*/
static void PrePasteSpecial( const SwWrtShell& rSh, const
TransferableDataHelper&, const VclPtr<SfxAbstractPasteDialog>& pDlg );
- static bool PasteFormat( SwWrtShell& rSh, const TransferableDataHelper&
rData,
+ SW_DLLPUBLIC static bool PasteFormat( SwWrtShell& rSh, const
TransferableDataHelper& rData,
SotClipboardFormatId nFormat );
static void FillClipFormatItem( const SwWrtShell& rSh,
@@ -229,7 +229,7 @@ public:
void SetCleanUp( bool bFlag ) { m_bCleanUp = bFlag; }
// public only for testing
- bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bMove,
+ SW_DLLPUBLIC bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool
bMove,
bool bIsXSelection );
// Interfaces for Selection
@@ -242,7 +242,7 @@ public:
// the related SwView is being closed and the SwTransferable is invalid now
void Invalidate() {m_pWrtShell = nullptr;}
- static void SelectPasteFormat(TransferableDataHelper& rData, sal_uInt8&
nAction,
+ SW_DLLPUBLIC static void SelectPasteFormat(TransferableDataHelper& rData,
sal_uInt8& nAction,
SotClipboardFormatId& nFormat);
};
