summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/acorrect.hxx4
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx5
-rw-r--r--sw/source/core/inc/docfld.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx6
4 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index f1d8c045bd3d..8c4c5a5cb91d 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -93,8 +93,8 @@ public:
class SwAutoCorrExceptWord
{
OUString m_sWord;
- ACFlags m_nFlags;
sal_uLong m_nNode;
+ ACFlags m_nFlags;
sal_Int32 m_nContent;
sal_Unicode m_cChar;
LanguageType m_eLanguage;
@@ -104,7 +104,7 @@ public:
SwAutoCorrExceptWord(ACFlags nAFlags, sal_uLong nNd, sal_Int32 nContent,
const OUString& rWord, sal_Unicode cChr,
LanguageType eLang)
- : m_sWord(rWord), m_nFlags(nAFlags), m_nNode(nNd), m_nContent(nContent),
+ : m_sWord(rWord), m_nNode(nNd), m_nFlags(nAFlags), m_nContent(nContent),
m_cChar(cChr), m_eLanguage(eLang), m_bDeleted(false)
{}
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index b2afe2c47f10..2a30da4d6c1c 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -42,9 +42,6 @@ namespace objectpositioning
private:
// object to be positioned
SdrObject& mrDrawObj;
-
- // does the object represents a Writer fly frame
- bool mbIsObjFly;
// #i26791# - anchored object the object belongs to;
SwAnchoredObject* mpAnchoredObj;
// frame the object is anchored at
@@ -53,6 +50,8 @@ namespace objectpositioning
SwContact* mpContact;
// frame format
const SwFrameFormat* mpFrameFormat;
+ // does the object represents a Writer fly frame
+ bool mbIsObjFly;
// #i62875#
bool mbFollowTextFlow;
// #i62875#
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 36cf3d86eba0..93d68cb01ec9 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -44,7 +44,6 @@ enum class SwFieldIds : sal_uInt16;
class SetGetExpField
{
sal_uLong m_nNode;
- sal_Int32 m_nContent;
union {
const SwTextField* pTextField;
const SwSection* pSection;
@@ -54,6 +53,7 @@ class SetGetExpField
const SwTextINetFormat* pTextINet;
const SwFlyFrameFormat* pFlyFormat;
} m_CNTNT;
+ sal_Int32 m_nContent;
enum SetGetExpFieldType
{
TEXTFIELD, TEXTTOXMARK, SECTIONNODE, CRSRPOS, TABLEBOX,
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 73e74d7d1fe9..64064a858023 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -98,15 +98,15 @@ void DelBookmarks(const SwNodeIndex& rStt,
* location. */
struct SaveFly
{
+ SwFrameFormat* pFrameFormat; /// the fly's frame format
sal_uLong nNdDiff; /// relative node difference
sal_Int32 nContentIndex; ///< index in node
- SwFrameFormat* pFrameFormat; /// the fly's frame format
bool isAtInsertNode; ///< if true, anchor _at_ insert node index
SaveFly( sal_uLong nNodeDiff, sal_Int32 const nCntntIdx, SwFrameFormat* pFormat, bool bInsert )
- : nNdDiff(nNodeDiff)
+ : pFrameFormat(pFormat)
+ , nNdDiff(nNodeDiff)
, nContentIndex(nCntntIdx)
- , pFrameFormat(pFormat)
, isAtInsertNode(bInsert)
{ }
};