sw/inc/calbck.hxx | 6 +-- sw/inc/hints.hxx | 4 +- sw/inc/ndgrf.hxx | 4 +- sw/inc/ndnotxt.hxx | 4 +- sw/inc/ndole.hxx | 4 +- sw/inc/ndtxt.hxx | 4 +- sw/inc/node.hxx | 72 ++++++++++++++++++------------------ sw/inc/tox.hxx | 30 +++++++-------- sw/source/core/attr/calbck.cxx | 10 ++--- sw/source/core/attr/hints.cxx | 10 ++--- sw/source/core/docnode/ndsect.cxx | 6 +-- sw/source/core/docnode/ndtbl.cxx | 20 +++++----- sw/source/core/docnode/node.cxx | 74 ++++++++++++++++++------------------- sw/source/core/docnode/nodes.cxx | 76 +++++++++++++++++++------------------- sw/source/core/tox/tox.cxx | 52 +++++++++++++------------- sw/source/core/undo/untbl.cxx | 6 +-- 16 files changed, 191 insertions(+), 191 deletions(-)
New commits: commit 99261989ddbf4ec0223fe8ed3e874b27edf8843e Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Oct 30 08:36:04 2015 +0100 sw: prefix members of SwFindNearestNode Change-Id: Iea2094f736837f5aecde2d9ff810dffb062d2315 diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 97a6397..481993d4 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -242,12 +242,12 @@ public: class SwFindNearestNode : public SwMsgPoolItem { - const SwNode *pNd, *pFnd; + const SwNode *m_pNode, *m_pFound; public: SwFindNearestNode( const SwNode& rNd ); void CheckNode( const SwNode& rNd ); - const SwNode* GetFoundNode() const { return pFnd; } + const SwNode* GetFoundNode() const { return m_pFound; } }; class SwStringMsgPoolItem : public SwMsgPoolItem diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index abbf1b0..47d25a7 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -150,19 +150,19 @@ SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) : } SwFindNearestNode::SwFindNearestNode( const SwNode& rNd ) - : SwMsgPoolItem( RES_FINDNEARESTNODE ), pNd( &rNd ), pFnd( 0 ) + : SwMsgPoolItem( RES_FINDNEARESTNODE ), m_pNode( &rNd ), m_pFound( 0 ) { } void SwFindNearestNode::CheckNode( const SwNode& rNd ) { - if( &pNd->GetNodes() == &rNd.GetNodes() ) + if( &m_pNode->GetNodes() == &rNd.GetNodes() ) { sal_uLong nIdx = rNd.GetIndex(); - if( nIdx < pNd->GetIndex() && - ( !pFnd || nIdx > pFnd->GetIndex() ) && + if( nIdx < m_pNode->GetIndex() && + ( !m_pFound || nIdx > m_pFound->GetIndex() ) && nIdx > rNd.GetNodes().GetEndOfExtras().GetIndex() ) - pFnd = &rNd; + m_pFound = &rNd; } } commit e794e43a0cedb9b836f0d1d75ad31413ee74cfea Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Oct 30 08:35:03 2015 +0100 sw: prefix members of SwForm Change-Id: I91c1aa5149bff9c6489ad6f1a68818b502d95966 diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 999c229..145d025 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -287,15 +287,15 @@ public: class SW_DLLPUBLIC SwForm { - SwFormTokens aPattern[ AUTH_TYPE_END + 1 ]; // #i21237# - OUString aTemplate[ AUTH_TYPE_END + 1 ]; + SwFormTokens m_aPattern[ AUTH_TYPE_END + 1 ]; // #i21237# + OUString m_aTemplate[ AUTH_TYPE_END + 1 ]; - TOXTypes eType; - sal_uInt16 nFormMaxLevel; + TOXTypes m_eType; + sal_uInt16 m_nFormMaxLevel; - bool bGenerateTabPos : 1; - bool bIsRelTabPos : 1; - bool bCommaSeparated : 1; + bool m_bGenerateTabPos : 1; + bool m_bIsRelTabPos : 1; + bool m_bCommaSeparated : 1; public: SwForm( TOXTypes eTOXType = TOX_CONTENT ); @@ -317,11 +317,11 @@ public: inline TOXTypes GetTOXType() const; inline sal_uInt16 GetFormMax() const; - bool IsRelTabPos() const { return bIsRelTabPos; } - void SetRelTabPos( bool b ) { bIsRelTabPos = b; } + bool IsRelTabPos() const { return m_bIsRelTabPos; } + void SetRelTabPos( bool b ) { m_bIsRelTabPos = b; } - bool IsCommaSeparated() const { return bCommaSeparated;} - void SetCommaSeparated( bool b) { bCommaSeparated = b;} + bool IsCommaSeparated() const { return m_bCommaSeparated;} + void SetCommaSeparated( bool b) { m_bCommaSeparated = b;} static sal_uInt16 GetFormMaxLevel( TOXTypes eType ); @@ -646,23 +646,23 @@ inline OUString SwTOXMark::GetSecondaryKeyReading() const inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); - aTemplate[nLevel] = rTemplate; + m_aTemplate[nLevel] = rTemplate; } inline OUString SwForm::GetTemplate(sal_uInt16 nLevel) const { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); - return aTemplate[nLevel]; + return m_aTemplate[nLevel]; } inline TOXTypes SwForm::GetTOXType() const { - return eType; + return m_eType; } inline sal_uInt16 SwForm::GetFormMax() const { - return nFormMaxLevel; + return m_nFormMaxLevel; } //SwTOXType diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 19d5f1d..ddb94bd 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -215,13 +215,13 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy) // Edit forms SwForm::SwForm( TOXTypes eTyp ) // #i21237# - : eType( eTyp ), nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )), + : m_eType( eTyp ), m_nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )), // nFirstTabPos( lNumIndent ), - bCommaSeparated(false) + m_bCommaSeparated(false) { //bHasFirstTabPos = - bGenerateTabPos = false; - bIsRelTabPos = true; + m_bGenerateTabPos = false; + m_bIsRelTabPos = true; // The table of contents has a certain number of headlines + headings // The user has 10 levels + headings @@ -229,7 +229,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# // Indexes of tables, object illustrations and authorities consist of a heading and one level sal_uInt16 nPoolId; - switch( eType ) + switch( m_eType ) { case TOX_INDEX: nPoolId = STR_POOLCOLL_TOX_IDXH; break; case TOX_USER: nPoolId = STR_POOLCOLL_TOX_USERH; break; @@ -245,14 +245,14 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# } SwFormTokens aTokens; - if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType ) + if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType ) { SwFormToken aLinkStt (TOKEN_LINK_START); aLinkStt.sCharStyleName = SW_RES(STR_POOLCHR_TOXJUMP); aTokens.push_back(aLinkStt); } - if (TOX_CONTENT == eType) + if (TOX_CONTENT == m_eType) { aTokens.push_back(SwFormToken(TOKEN_ENTRY_NO)); aTokens.push_back(SwFormToken(TOKEN_ENTRY_TEXT)); @@ -260,7 +260,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else aTokens.push_back(SwFormToken(TOKEN_ENTRY)); - if (TOX_AUTHORITIES != eType) + if (TOX_AUTHORITIES != m_eType) { SwFormToken aToken(TOKEN_TAB_STOP); aToken.nTabStopPosition = 0; @@ -273,12 +273,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS)); } - if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType) + if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType) aTokens.push_back(SwFormToken(TOKEN_LINK_END)); SetTemplate( 0, SW_RESSTR( nPoolId++ )); - if(TOX_INDEX == eType) + if(TOX_INDEX == m_eType) { for( sal_uInt16 i = 1; i < 5; ++i ) { @@ -301,7 +301,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Number 0 is the title { - if(TOX_AUTHORITIES == eType) + if(TOX_AUTHORITIES == m_eType) { SwFormTokens aAuthTokens; lcl_FillAuthPattern(aAuthTokens, i); @@ -310,35 +310,35 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else SetPattern( i, aTokens ); - if( TOX_CONTENT == eType && 6 == i ) + if( TOX_CONTENT == m_eType && 6 == i ) nPoolId = STR_POOLCOLL_TOX_CNTNT6; - else if( TOX_USER == eType && 6 == i ) + else if( TOX_USER == m_eType && 6 == i ) nPoolId = STR_POOLCOLL_TOX_USER6; - else if( TOX_AUTHORITIES == eType ) + else if( TOX_AUTHORITIES == m_eType ) nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1; SetTemplate( i, SW_RESSTR( nPoolId ) ); } } SwForm::SwForm(const SwForm& rForm) - : eType( rForm.eType ) + : m_eType( rForm.m_eType ) { *this = rForm; } SwForm& SwForm::operator=(const SwForm& rForm) { - eType = rForm.eType; - nFormMaxLevel = rForm.nFormMaxLevel; + m_eType = rForm.m_eType; + m_nFormMaxLevel = rForm.m_nFormMaxLevel; // nFirstTabPos = rForm.nFirstTabPos; // bHasFirstTabPos = rForm.bHasFirstTabPos; - bGenerateTabPos = rForm.bGenerateTabPos; - bIsRelTabPos = rForm.bIsRelTabPos; - bCommaSeparated = rForm.bCommaSeparated; - for(sal_uInt16 i=0; i < nFormMaxLevel; ++i) + m_bGenerateTabPos = rForm.m_bGenerateTabPos; + m_bIsRelTabPos = rForm.m_bIsRelTabPos; + m_bCommaSeparated = rForm.m_bCommaSeparated; + for(sal_uInt16 i=0; i < m_nFormMaxLevel; ++i) { - aPattern[i] = rForm.aPattern[i]; - aTemplate[i] = rForm.aTemplate[i]; + m_aPattern[i] = rForm.m_aPattern[i]; + m_aTemplate[i] = rForm.m_aTemplate[i]; } return *this; } @@ -841,7 +841,7 @@ SwFormTokensHelper::SwFormTokensHelper(const OUString & rPattern) void SwForm::SetPattern(sal_uInt16 nLevel, const SwFormTokens& rTokens) { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); - aPattern[nLevel] = rTokens; + m_aPattern[nLevel] = rTokens; } void SwForm::SetPattern(sal_uInt16 nLevel, const OUString & rStr) @@ -849,13 +849,13 @@ void SwForm::SetPattern(sal_uInt16 nLevel, const OUString & rStr) OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); SwFormTokensHelper aHelper(rStr); - aPattern[nLevel] = aHelper.GetTokens(); + m_aPattern[nLevel] = aHelper.GetTokens(); } const SwFormTokens& SwForm::GetPattern(sal_uInt16 nLevel) const { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); - return aPattern[nLevel]; + return m_aPattern[nLevel]; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 1d46941fd140940928bd4376d6cd9b8e928ac261 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Oct 30 08:33:03 2015 +0100 sw: prefix members of SwModify Change-Id: Ia8d44e5c8a987aa1c0cc38e885eadd595b70a898 diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index f6383d0..ecf400b 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwModify: public SwClient template<typename E, typename S> friend class SwIterator; sw::WriterListener* m_pWriterListeners; // the start of the linked list of clients bool m_bModifyLocked : 1; // don't broadcast changes now - bool bLockClientList : 1; // may be set when this instance notifies its clients + bool m_bLockClientList : 1; // may be set when this instance notifies its clients bool m_bInDocDTOR : 1; // workaround for problems when a lot of objects are destroyed bool m_bInCache : 1; bool m_bInSwFntCache : 1; @@ -162,10 +162,10 @@ class SW_DLLPUBLIC SwModify: public SwClient SwModify &operator =(const SwModify&) = delete; public: SwModify() - : SwClient(nullptr), m_pWriterListeners(nullptr), m_bModifyLocked(false), bLockClientList(false), m_bInDocDTOR(false), m_bInCache(false), m_bInSwFntCache(false) + : SwClient(nullptr), m_pWriterListeners(nullptr), m_bModifyLocked(false), m_bLockClientList(false), m_bInDocDTOR(false), m_bInCache(false), m_bInSwFntCache(false) {} explicit SwModify( SwModify* pToRegisterIn ) - : SwClient(pToRegisterIn), m_pWriterListeners(nullptr), m_bModifyLocked(false), bLockClientList(false), m_bInDocDTOR(false), m_bInCache(false), m_bInSwFntCache(false) + : SwClient(pToRegisterIn), m_pWriterListeners(nullptr), m_bModifyLocked(false), m_bLockClientList(false), m_bInDocDTOR(false), m_bInCache(false), m_bInSwFntCache(false) {} // broadcasting: send notifications to all clients diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index d836db2..fafb9a6 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -124,7 +124,7 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* p // mba: WTF?! if( !pOldValue ) { - bLockClientList = true; + m_bLockClientList = true; } else { @@ -132,16 +132,16 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* p { case RES_OBJECTDYING: case RES_REMOVE_UNO_OBJECT: - bLockClientList = static_cast<const SwPtrMsgPoolItem*>(pOldValue)->pObject != this; + m_bLockClientList = static_cast<const SwPtrMsgPoolItem*>(pOldValue)->pObject != this; break; default: - bLockClientList = true; + m_bLockClientList = true; } } ModifyBroadcast( pOldValue, pNewValue ); - bLockClientList = false; + m_bLockClientList = false; UnlockModify(); } @@ -158,7 +158,7 @@ bool SwModify::GetInfo( SfxPoolItem& rInfo ) const void SwModify::Add( SwClient* pDepend ) { - OSL_ENSURE( !bLockClientList, "Client inserted while in Modify" ); + OSL_ENSURE( !m_bLockClientList, "Client inserted while in Modify" ); if(pDepend->pRegisteredIn != this ) { commit 150fdfc77274909dd9281b97c1e166cac838c60e Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Oct 30 08:32:48 2015 +0100 sw: prefix members of SwNode Change-Id: I3ce33c8ea0c09948785621785d199ece6eda128a diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index ffaa0f9..3fed0de 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -205,12 +205,12 @@ public: // Inline methods from Node.hxx - it is only now that we know TextNode!! inline SwGrfNode *SwNode::GetGrfNode() { - return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0; + return ND_GRFNODE == m_nNodeType ? static_cast<SwGrfNode*>(this) : 0; } inline const SwGrfNode *SwNode::GetGrfNode() const { - return ND_GRFNODE == nNodeType ? static_cast<const SwGrfNode*>(this) : 0; + return ND_GRFNODE == m_nNodeType ? static_cast<const SwGrfNode*>(this) : 0; } inline bool SwGrfNode::IsLinkedFile() const diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index caa537b..722b874 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -93,11 +93,11 @@ public: // Inline methods from Node.hxx - we know TextNode only here!! inline SwNoTextNode *SwNode::GetNoTextNode() { - return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTextNode*>(this) : 0; + return ND_NOTXTNODE & m_nNodeType ? static_cast<SwNoTextNode*>(this) : 0; } inline const SwNoTextNode *SwNode::GetNoTextNode() const { - return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTextNode*>(this) : 0; + return ND_NOTXTNODE & m_nNodeType ? static_cast<const SwNoTextNode*>(this) : 0; } #endif // INCLUDED_SW_INC_NDNOTXT_HXX diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 0d5451e..ce18701 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -140,12 +140,12 @@ public: /// Inline methods from Node.hxx inline SwOLENode *SwNode::GetOLENode() { - return ND_OLENODE == nNodeType ? static_cast<SwOLENode*>(this) : 0; + return ND_OLENODE == m_nNodeType ? static_cast<SwOLENode*>(this) : 0; } inline const SwOLENode *SwNode::GetOLENode() const { - return ND_OLENODE == nNodeType ? static_cast<const SwOLENode*>(this) : 0; + return ND_OLENODE == m_nNodeType ? static_cast<const SwOLENode*>(this) : 0; } #endif // _ INCLUDED_SW_INC_NDOLE_HXX diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index b80ffc1..95ce85f 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -852,12 +852,12 @@ inline SwTextFormatColl* SwTextNode::GetTextColl() const /// Inline methods from Node.hxx inline SwTextNode *SwNode::GetTextNode() { - return ND_TEXTNODE == nNodeType ? static_cast<SwTextNode*>(this) : 0; + return ND_TEXTNODE == m_nNodeType ? static_cast<SwTextNode*>(this) : 0; } inline const SwTextNode *SwNode::GetTextNode() const { - return ND_TEXTNODE == nNodeType ? static_cast<const SwTextNode*>(this) : 0; + return ND_TEXTNODE == m_nNodeType ? static_cast<const SwTextNode*>(this) : 0; } inline void diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 2bb668d..9a5b903 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -82,12 +82,12 @@ class SW_DLLPUBLIC SwNode { friend class SwNodes; - sal_uInt8 nNodeType; + sal_uInt8 m_nNodeType; /// For text nodes: level of auto format. Was put here because we had still free bits. - sal_uInt8 nAFormatNumLvl : 3; - bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent. - bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag + sal_uInt8 m_nAFormatNumLvl : 3; + bool m_bSetNumLSpace : 1; ///< For numbering: TRUE: set indent. + bool m_bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag #ifdef DBG_UTIL static long s_nSerial; @@ -100,7 +100,7 @@ class SW_DLLPUBLIC SwNode std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys; protected: - SwStartNode* pStartOfSection; + SwStartNode* m_pStartOfSection; SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeId ); @@ -119,22 +119,22 @@ public: sal_uInt16 GetSectionLevel() const; inline sal_uLong StartOfSectionIndex() const; - inline const SwStartNode* StartOfSectionNode() const { return pStartOfSection; } - inline SwStartNode* StartOfSectionNode() { return pStartOfSection; } + inline const SwStartNode* StartOfSectionNode() const { return m_pStartOfSection; } + inline SwStartNode* StartOfSectionNode() { return m_pStartOfSection; } inline sal_uLong EndOfSectionIndex() const; inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline sal_uInt8 GetAutoFormatLvl() const { return nAFormatNumLvl; } - inline void SetAutoFormatLvl( sal_uInt8 nVal ) { nAFormatNumLvl = nVal; } + inline sal_uInt8 GetAutoFormatLvl() const { return m_nAFormatNumLvl; } + inline void SetAutoFormatLvl( sal_uInt8 nVal ) { m_nAFormatNumLvl = nVal; } - inline void SetNumLSpace( bool bFlag ) { bSetNumLSpace = bFlag; } + inline void SetNumLSpace( bool bFlag ) { m_bSetNumLSpace = bFlag; } - inline bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; } - inline void SetIgnoreDontExpand( bool bNew ) { bIgnoreDontExpand = bNew; } + inline bool IsIgnoreDontExpand() const { return m_bIgnoreDontExpand; } + inline void SetIgnoreDontExpand( bool bNew ) { m_bIgnoreDontExpand = bNew; } - sal_uInt8 GetNodeType() const { return nNodeType; } + sal_uInt8 GetNodeType() const { return m_nNodeType; } inline SwStartNode *GetStartNode(); inline const SwStartNode *GetStartNode() const; @@ -589,80 +589,80 @@ private: inline SwEndNode *SwNode::GetEndNode() { - return ND_ENDNODE == nNodeType ? static_cast<SwEndNode*>(this) : 0; + return ND_ENDNODE == m_nNodeType ? static_cast<SwEndNode*>(this) : 0; } inline const SwEndNode *SwNode::GetEndNode() const { - return ND_ENDNODE == nNodeType ? static_cast<const SwEndNode*>(this) : 0; + return ND_ENDNODE == m_nNodeType ? static_cast<const SwEndNode*>(this) : 0; } inline SwStartNode *SwNode::GetStartNode() { - return ND_STARTNODE & nNodeType ? static_cast<SwStartNode*>(this) : 0; + return ND_STARTNODE & m_nNodeType ? static_cast<SwStartNode*>(this) : 0; } inline const SwStartNode *SwNode::GetStartNode() const { - return ND_STARTNODE & nNodeType ? static_cast<const SwStartNode*>(this) : 0; + return ND_STARTNODE & m_nNodeType ? static_cast<const SwStartNode*>(this) : 0; } inline SwTableNode *SwNode::GetTableNode() { - return ND_TABLENODE == nNodeType ? static_cast<SwTableNode*>(this) : 0; + return ND_TABLENODE == m_nNodeType ? static_cast<SwTableNode*>(this) : 0; } inline const SwTableNode *SwNode::GetTableNode() const { - return ND_TABLENODE == nNodeType ? static_cast<const SwTableNode*>(this) : 0; + return ND_TABLENODE == m_nNodeType ? static_cast<const SwTableNode*>(this) : 0; } inline SwSectionNode *SwNode::GetSectionNode() { - return ND_SECTIONNODE == nNodeType ? static_cast<SwSectionNode*>(this) : 0; + return ND_SECTIONNODE == m_nNodeType ? static_cast<SwSectionNode*>(this) : 0; } inline const SwSectionNode *SwNode::GetSectionNode() const { - return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0; + return ND_SECTIONNODE == m_nNodeType ? static_cast<const SwSectionNode*>(this) : 0; } inline SwContentNode *SwNode::GetContentNode() { - return ND_CONTENTNODE & nNodeType ? static_cast<SwContentNode*>(this) : 0; + return ND_CONTENTNODE & m_nNodeType ? static_cast<SwContentNode*>(this) : 0; } inline const SwContentNode *SwNode::GetContentNode() const { - return ND_CONTENTNODE & nNodeType ? static_cast<const SwContentNode*>(this) : 0; + return ND_CONTENTNODE & m_nNodeType ? static_cast<const SwContentNode*>(this) : 0; } inline bool SwNode::IsStartNode() const { - return (ND_STARTNODE & nNodeType) != 0; + return (ND_STARTNODE & m_nNodeType) != 0; } inline bool SwNode::IsContentNode() const { - return (ND_CONTENTNODE & nNodeType) != 0; + return (ND_CONTENTNODE & m_nNodeType) != 0; } inline bool SwNode::IsEndNode() const { - return ND_ENDNODE == nNodeType; + return ND_ENDNODE == m_nNodeType; } inline bool SwNode::IsTextNode() const { - return ND_TEXTNODE == nNodeType; + return ND_TEXTNODE == m_nNodeType; } inline bool SwNode::IsTableNode() const { - return ND_TABLENODE == nNodeType; + return ND_TABLENODE == m_nNodeType; } inline bool SwNode::IsSectionNode() const { - return ND_SECTIONNODE == nNodeType; + return ND_SECTIONNODE == m_nNodeType; } inline bool SwNode::IsNoTextNode() const { - return (ND_NOTXTNODE & nNodeType) != 0; + return (ND_NOTXTNODE & m_nNodeType) != 0; } inline bool SwNode::IsOLENode() const { - return ND_OLENODE == nNodeType; + return ND_OLENODE == m_nNodeType; } inline bool SwNode::IsGrfNode() const { - return ND_GRFNODE == nNodeType; + return ND_GRFNODE == m_nNodeType; } inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) const @@ -679,21 +679,21 @@ inline const SwSectionNode* SwNode::FindSectionNode() const } inline sal_uLong SwNode::StartOfSectionIndex() const { - return pStartOfSection->GetIndex(); + return m_pStartOfSection->GetIndex(); } inline sal_uLong SwNode::EndOfSectionIndex() const { - const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection; + const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : m_pStartOfSection; return pStNd->m_pEndOfSection->GetIndex(); } inline const SwEndNode* SwNode::EndOfSectionNode() const { - const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection; + const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : m_pStartOfSection; return pStNd->m_pEndOfSection; } inline SwEndNode* SwNode::EndOfSectionNode() { - const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : pStartOfSection; + const SwStartNode* pStNd = IsStartNode() ? static_cast<const SwStartNode*>(this) : m_pStartOfSection; return pStNd->m_pEndOfSection; } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 800c8ec..e13f547 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -915,7 +915,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx, // Attach all Sections in the NodeSection underneath the new one if( ULONG_MAX == nSkipIdx ) - pNd->pStartOfSection = pSectNd; + pNd->m_pStartOfSection = pSectNd; else if( n >= nSkipIdx ) nSkipIdx = ULONG_MAX; @@ -963,9 +963,9 @@ SwSectionNode* SwNode::FindSectionNode() { if( IsSectionNode() ) return GetSectionNode(); - SwStartNode* pTmp = pStartOfSection; + SwStartNode* pTmp = m_pStartOfSection; while( !pTmp->IsSectionNode() && pTmp->GetIndex() ) - pTmp = pTmp->pStartOfSection; + pTmp = pTmp->m_pStartOfSection; return pTmp->GetSectionNode(); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 250bf3b..1faddb2 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -292,7 +292,7 @@ bool SwNodes::InsBoxen( SwTableNode* pTableNd, { SwStartNode* pSttNd = new SwStartNode( aEndIdx, ND_STARTNODE, SwTableBoxStartNode ); - pSttNd->pStartOfSection = pTableNd; + pSttNd->m_pStartOfSection = pTableNd; new SwEndNode( aEndIdx, *pSttNd ); pPrvBox = new SwTableBox( pBoxFormat, *pSttNd, pLine ); @@ -586,7 +586,7 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx, { SwStartNode* pSttNd = new SwStartNode( aIdx, ND_STARTNODE, SwTableBoxStartNode ); - pSttNd->pStartOfSection = pTableNd; + pSttNd->m_pStartOfSection = pTableNd; SwTextNode * pTmpNd = new SwTextNode( aIdx, pTextColl ); @@ -1044,7 +1044,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, lcl_RemoveBreaks(*pTextNd, (0 == nLines) ? pTableFormat : 0); // Set the TableNode as StartNode for all TextNodes in the Table - pTextNd->pStartOfSection = pTableNd; + pTextNd->m_pStartOfSection = pTableNd; SwTableLine* pLine = new SwTableLine( pLineFormat, 1, 0 ); rTable.GetTabLines().insert(rTable.GetTabLines().begin() + nLines, pLine); @@ -1076,7 +1076,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, pSttNd = new SwStartNode( aTmpIdx, ND_STARTNODE, SwTableBoxStartNode ); new SwEndNode( aCntPos.nNode, *pSttNd ); - pNewNd->pStartOfSection = pSttNd; + pNewNd->m_pStartOfSection = pSttNd; // Assign Section to the Box pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine ); @@ -1096,7 +1096,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, pSttNd = new SwStartNode( aCntPos.nNode, ND_STARTNODE, SwTableBoxStartNode ); const SwNodeIndex aTmpIdx( aCntPos.nNode, 1 ); new SwEndNode( aTmpIdx, *pSttNd ); - pTextNd->pStartOfSection = pSttNd; + pTextNd->m_pStartOfSection = pSttNd; pBox = new SwTableBox( pBoxFormat, *pSttNd, pLine ); pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox ); @@ -1415,7 +1415,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes, SwNodeIndex aCellNodeIdx = aCellIter->aStart; for(;aCellNodeIdx <= aCellIter->aEnd; ++aCellNodeIdx ) { - aCellNodeIdx.GetNode().pStartOfSection = pSttNd; + aCellNodeIdx.GetNode().m_pStartOfSection = pSttNd; //skip start/end node pairs if( aCellNodeIdx.GetNode().IsStartNode() ) aCellNodeIdx = SwNodeIndex( *aCellNodeIdx.GetNode().EndOfSectionNode() ); @@ -3414,13 +3414,13 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter, pNewTableNd = new SwTableNode( aIdx ); pNewTableNd->GetTable().SetTableModel( rTable.IsNewModel() ); - pOldTableEndNd->pStartOfSection = pNewTableNd; + pOldTableEndNd->m_pStartOfSection = pNewTableNd; pNewTableNd->m_pEndOfSection = pOldTableEndNd; SwNode* pBoxNd = aIdx.GetNode().GetStartNode(); do { OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" ); - pBoxNd->pStartOfSection = pNewTableNd; + pBoxNd->m_pStartOfSection = pNewTableNd; pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ]; } while( pBoxNd != pOldTableEndNd ); } @@ -3622,10 +3622,10 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev, SwNode* pBoxNd = aIdx.GetNode().GetStartNode(); do { OSL_ENSURE( pBoxNd->IsStartNode(), "This needs to be a StartNode!" ); - pBoxNd->pStartOfSection = pTableNd; + pBoxNd->m_pStartOfSection = pTableNd; pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ]; } while( pBoxNd != pTableEndNd ); - pBoxNd->pStartOfSection = pTableNd; + pBoxNd->m_pStartOfSection = pTableNd; aIdx -= 2; DelNodes( aIdx, 2 ); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 3a1f2e8..7d67454 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -267,13 +267,13 @@ sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet, sal_uInt16 SwNode::GetSectionLevel() const { // EndNode of a BaseSection? They are always 0! - if( IsEndNode() && 0 == pStartOfSection->StartOfSectionIndex() ) + if( IsEndNode() && 0 == m_pStartOfSection->StartOfSectionIndex() ) return 0; sal_uInt16 nLevel; - const SwNode* pNode = IsStartNode() ? this : pStartOfSection; + const SwNode* pNode = IsStartNode() ? this : m_pStartOfSection; for( nLevel = 1; 0 != pNode->StartOfSectionIndex(); ++nLevel ) - pNode = pNode->pStartOfSection; + pNode = pNode->m_pStartOfSection; return IsEndNode() ? nLevel-1 : nLevel; } @@ -282,27 +282,27 @@ long SwNode::s_nSerial = 0; #endif SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType ) - : nNodeType( nNdType ) - , nAFormatNumLvl( 0 ) - , bSetNumLSpace( false ) - , bIgnoreDontExpand( false) + : m_nNodeType( nNdType ) + , m_nAFormatNumLvl( 0 ) + , m_bSetNumLSpace( false ) + , m_bIgnoreDontExpand( false) #ifdef DBG_UTIL , m_nSerial( s_nSerial++) #endif - , pStartOfSection( 0 ) + , m_pStartOfSection( 0 ) { if( rWhere.GetIndex() ) { SwNodes& rNodes = const_cast<SwNodes&> (rWhere.GetNodes()); SwNode* pNd = rNodes[ rWhere.GetIndex() -1 ]; rNodes.InsertNode( this, rWhere ); - if( 0 == ( pStartOfSection = pNd->GetStartNode()) ) + if( 0 == ( m_pStartOfSection = pNd->GetStartNode()) ) { - pStartOfSection = pNd->pStartOfSection; + m_pStartOfSection = pNd->m_pStartOfSection; if( pNd->GetEndNode() ) // Skip EndNode ? Section { - pNd = pStartOfSection; - pStartOfSection = pNd->pStartOfSection; + pNd = m_pStartOfSection; + m_pStartOfSection = pNd->m_pStartOfSection; } } } @@ -315,26 +315,26 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType ) * @param nNdType the type of node to insert */ SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType ) - : nNodeType( nNdType ) - , nAFormatNumLvl( 0 ) - , bSetNumLSpace( false ) - , bIgnoreDontExpand( false) + : m_nNodeType( nNdType ) + , m_nAFormatNumLvl( 0 ) + , m_bSetNumLSpace( false ) + , m_bIgnoreDontExpand( false) #ifdef DBG_UTIL , m_nSerial( s_nSerial++) #endif - , pStartOfSection( 0 ) + , m_pStartOfSection( 0 ) { if( nPos ) { SwNode* pNd = rNodes[ nPos - 1 ]; rNodes.InsertNode( this, nPos ); - if( 0 == ( pStartOfSection = pNd->GetStartNode()) ) + if( 0 == ( m_pStartOfSection = pNd->GetStartNode()) ) { - pStartOfSection = pNd->pStartOfSection; + m_pStartOfSection = pNd->m_pStartOfSection; if( pNd->GetEndNode() ) // Skip EndNode ? Section! { - pNd = pStartOfSection; - pStartOfSection = pNd->pStartOfSection; + pNd = m_pStartOfSection; + m_pStartOfSection = pNd->m_pStartOfSection; } } } @@ -351,9 +351,9 @@ SwTableNode* SwNode::FindTableNode() { if( IsTableNode() ) return GetTableNode(); - SwStartNode* pTmp = pStartOfSection; + SwStartNode* pTmp = m_pStartOfSection; while( !pTmp->IsTableNode() && pTmp->GetIndex() ) - pTmp = pTmp->pStartOfSection; + pTmp = pTmp->m_pStartOfSection; return pTmp->GetTableNode(); } @@ -363,12 +363,12 @@ bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const bool bRet = false; const SwContentNode* pNd; - if( ND_STARTNODE & nNodeType ) + if( ND_STARTNODE & m_nNodeType ) { SwNodeIndex aIdx( *this ); pNd = GetNodes().GoNext( &aIdx ); } - else if( ND_ENDNODE & nNodeType ) + else if( ND_ENDNODE & m_nNodeType ) { SwNodeIndex aIdx( *EndOfSectionNode() ); pNd = SwNodes::GoPrevious( &aIdx ); @@ -404,7 +404,7 @@ bool SwNode::IsInVisibleArea( SwViewShell const * pSh ) const bool SwNode::IsInProtectSect() const { - const SwNode* pNd = ND_SECTIONNODE == nNodeType ? pStartOfSection : this; + const SwNode* pNd = ND_SECTIONNODE == m_nNodeType ? m_pStartOfSection : this; const SwSectionNode* pSectNd = pNd->FindSectionNode(); return pSectNd && pSectNd->GetSection().IsProtectFlag(); } @@ -414,7 +414,7 @@ bool SwNode::IsInProtectSect() const /// Frames/Footnotes/... bool SwNode::IsProtect() const { - const SwNode* pNd = ND_SECTIONNODE == nNodeType ? pStartOfSection : this; + const SwNode* pNd = ND_SECTIONNODE == m_nNodeType ? m_pStartOfSection : this; const SwStartNode* pSttNd = pNd->FindSectionNode(); if( pSttNd && static_cast<const SwSectionNode*>(pSttNd)->GetSection().IsProtectFlag() ) return true; @@ -465,12 +465,12 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay, const SwPageDesc* pPgDesc = 0; const SwContentNode* pNode; - if( ND_STARTNODE & nNodeType ) + if( ND_STARTNODE & m_nNodeType ) { SwNodeIndex aIdx( *this ); pNode = GetNodes().GoNext( &aIdx ); } - else if( ND_ENDNODE & nNodeType ) + else if( ND_ENDNODE & m_nNodeType ) { SwNodeIndex aIdx( *EndOfSectionNode() ); pNode = SwNodes::GoPrevious( &aIdx ); @@ -748,10 +748,10 @@ SwTableBox* SwNode::GetTableBox() const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) { - SwStartNode* pTmp = IsStartNode() ? static_cast<SwStartNode*>(this) : pStartOfSection; + SwStartNode* pTmp = IsStartNode() ? static_cast<SwStartNode*>(this) : m_pStartOfSection; while( eTyp != pTmp->GetStartNodeType() && pTmp->GetIndex() ) - pTmp = pTmp->pStartOfSection; + pTmp = pTmp->m_pStartOfSection; return eTyp == pTmp->GetStartNodeType() ? pTmp : 0; } @@ -885,7 +885,7 @@ SwStartNode::SwStartNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, { SwNodes& rNodes = const_cast<SwNodes&> (rWhere.GetNodes()); rNodes.InsertNode( this, rWhere ); - pStartOfSection = this; + m_pStartOfSection = this; } // Just do this temporarily until the EndNode is inserted m_pEndOfSection = reinterpret_cast<SwEndNode*>(this); @@ -897,7 +897,7 @@ SwStartNode::SwStartNode( SwNodes& rNodes, sal_uLong nPos ) if( !nPos ) { rNodes.InsertNode( this, nPos ); - pStartOfSection = this; + m_pStartOfSection = this; } // Just do this temporarily until the EndNode is inserted m_pEndOfSection = reinterpret_cast<SwEndNode*>(this); @@ -980,15 +980,15 @@ void SwStartNode::dumpAsXml(xmlTextWriterPtr pWriter) const SwEndNode::SwEndNode( const SwNodeIndex &rWhere, SwStartNode& rSttNd ) : SwNode( rWhere, ND_ENDNODE ) { - pStartOfSection = &rSttNd; - pStartOfSection->m_pEndOfSection = this; + m_pStartOfSection = &rSttNd; + m_pStartOfSection->m_pEndOfSection = this; } SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd ) : SwNode( rNds, nPos, ND_ENDNODE ) { - pStartOfSection = &rSttNd; - pStartOfSection->m_pEndOfSection = this; + m_pStartOfSection = &rSttNd; + m_pStartOfSection->m_pEndOfSection = this; } SwContentNode::SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 9215028..4b9d55c 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -73,15 +73,15 @@ SwNodes::SwNodes( SwDoc* pDocument ) m_pEndOfInserts = new SwEndNode( *this, nPos++, *pTmp ); pTmp = new SwStartNode( *this, nPos++ ); - pTmp->pStartOfSection = pSttNd; + pTmp->m_pStartOfSection = pSttNd; m_pEndOfAutotext = new SwEndNode( *this, nPos++, *pTmp ); pTmp = new SwStartNode( *this, nPos++ ); - pTmp->pStartOfSection = pSttNd; + pTmp->m_pStartOfSection = pSttNd; m_pEndOfRedlines = new SwEndNode( *this, nPos++, *pTmp ); pTmp = new SwStartNode( *this, nPos++ ); - pTmp->pStartOfSection = pSttNd; + pTmp->m_pStartOfSection = pSttNd; m_pEndOfContent = new SwEndNode( *this, nPos++, *pTmp ); m_pOutlineNodes = new SwOutlineNodes; @@ -418,7 +418,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // skip "simple" start or end nodes while( ND_STARTNODE == (pAktNode = &aRg.aStart.GetNode())->GetNodeType() || ( pAktNode->IsEndNode() && - !pAktNode->pStartOfSection->IsSectionNode() ) ) + !pAktNode->m_pStartOfSection->IsSectionNode() ) ) ++aRg.aStart; --aRg.aStart; @@ -427,7 +427,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, while( ( (( pAktNode = &aRg.aEnd.GetNode())->GetStartNode() && !pAktNode->IsSectionNode() ) || ( pAktNode->IsEndNode() && - ND_STARTNODE == pAktNode->pStartOfSection->GetNodeType()) ) && + ND_STARTNODE == pAktNode->m_pStartOfSection->GetNodeType()) ) && aRg.aEnd > aRg.aStart ) --aRg.aEnd; @@ -452,7 +452,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // set start index SwNodeIndex aIdx( aIndex ); - SwStartNode* pStartNode = aIdx.GetNode().pStartOfSection; + SwStartNode* pStartNode = aIdx.GetNode().m_pStartOfSection; aSttNdStack.insert( aSttNdStack.begin(), pStartNode ); SwNodeRange aOrigInsPos( aIdx, -1, aIdx ); // original insertion position @@ -477,7 +477,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, nInsPos = 0; } - SwStartNode* pSttNd = pAktNode->pStartOfSection; + SwStartNode* pSttNd = pAktNode->m_pStartOfSection; if( pSttNd->IsTableNode() ) { SwTableNode* pTableNd = static_cast<SwTableNode*>(pSttNd); @@ -500,7 +500,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, { // move all Start/End/ContentNodes // ContentNodes: delete also the frames! - pTableNd->pStartOfSection = aIdx.GetNode().pStartOfSection; + pTableNd->m_pStartOfSection = aIdx.GetNode().m_pStartOfSection; for( sal_uLong n = 0; n < nInsPos; ++n ) { SwNodeIndex aMvIdx( aRg.aEnd, 1 ); @@ -534,7 +534,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // get StartNode // Even aIdx points to a startnode, we need the startnode // of the environment of aIdx (#i80941) - SwStartNode* pSttNode = aIdx.GetNode().pStartOfSection; + SwStartNode* pSttNode = aIdx.GetNode().m_pStartOfSection; // get all boxes with content because their indices // pointing to the StartNodes need to be reset @@ -551,7 +551,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, m_pOutlineNodes->erase( pNd ); RemoveNode( aMvIdx.GetIndex(), 1, false ); - pNd->pStartOfSection = pSttNode; + pNd->m_pStartOfSection = pSttNode; rNodes.InsertNode( pNd, aIdx ); // set correct indices in Start/EndNodes @@ -565,7 +565,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, pSttNode->m_pEndOfSection = static_cast<SwEndNode*>(pNd); if( pSttNode->IsSectionNode() ) static_cast<SwSectionNode*>(pSttNode)->NodesArrChgd(); - pSttNode = pSttNode->pStartOfSection; + pSttNode = pSttNode->m_pStartOfSection; } } @@ -654,11 +654,11 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, // this StartNode will be removed later SwStartNode* pTmpSttNd = new SwStartNode( *this, nSttPos+1 ); - pTmpSttNd->pStartOfSection = pSttNd->pStartOfSection; + pTmpSttNd->m_pStartOfSection = pSttNd->m_pStartOfSection; RemoveNode( nSttPos, 1, false ); // SttNode loeschen - pSttNd->pStartOfSection = aIdx.GetNode().pStartOfSection; + pSttNd->m_pStartOfSection = aIdx.GetNode().m_pStartOfSection; rNodes.InsertNode( pSttNd, aIdx ); rNodes.InsertNode( pAktNode, aIdx ); --aIdx; @@ -731,7 +731,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, { SwNodeIndex aCntIdx( aRg.aEnd ); for( sal_uLong n = 0; n < nInsPos; n++, ++aCntIdx) - aCntIdx.GetNode().pStartOfSection = pTmpStt; + aCntIdx.GetNode().m_pStartOfSection = pTmpStt; } // also set correct StartNode for all decreased nodes @@ -740,7 +740,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, aTmpEIdx = pAktNode->StartOfSectionIndex(); else { - pAktNode->pStartOfSection = pTmpStt; + pAktNode->m_pStartOfSection = pTmpStt; --aTmpEIdx; } @@ -797,7 +797,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, { if( bNewFrms && pAktNode->GetContentNode() ) static_cast<SwContentNode*>(pAktNode)->DelFrms(); - pAktNode->pStartOfSection = aSttNdStack[ nLevel ]; + pAktNode->m_pStartOfSection = aSttNdStack[ nLevel ]; nInsPos++; --aRg.aEnd; } @@ -808,7 +808,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, if( bNewFrms && pAktNode->GetContentNode() ) static_cast<SwContentNode*>(pAktNode)->DelFrms(); - pAktNode->pStartOfSection = aSttNdStack[ nLevel ]; + pAktNode->m_pStartOfSection = aSttNdStack[ nLevel ]; nInsPos++; --aRg.aEnd; } @@ -820,7 +820,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, if( &rNodes == this ) // inside UndoNodesArray { // move everything - pAktNode->pStartOfSection = aSttNdStack[ nLevel ]; + pAktNode->m_pStartOfSection = aSttNdStack[ nLevel ]; nInsPos++; } else // move into "normal" node array @@ -969,10 +969,10 @@ void SwNodes::SectionUp(SwNodeRange *pRange) if( pAktNode->IsStartNode() ) // selbst StartNode { SwEndNode* pEndNd = pRange->aEnd.GetNode().GetEndNode(); - if( pAktNode == pEndNd->pStartOfSection ) + if( pAktNode == pEndNd->m_pStartOfSection ) { // there was a pairwise reset, adjust only those in the range - SwStartNode* pTmpSttNd = pAktNode->pStartOfSection; + SwStartNode* pTmpSttNd = pAktNode->m_pStartOfSection; RemoveNode( pRange->aStart.GetIndex(), 1, true ); RemoveNode( pRange->aEnd.GetIndex(), 1, true ); @@ -980,7 +980,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange) while( aTmpIdx < pRange->aEnd ) { pAktNode = &aTmpIdx.GetNode(); - pAktNode->pStartOfSection = pTmpSttNd; + pAktNode->m_pStartOfSection = pTmpSttNd; if( pAktNode->IsStartNode() ) aTmpIdx = pAktNode->EndOfSectionIndex() + 1; else @@ -1035,7 +1035,7 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn for( ;; ++aTmpIdx ) { SwNode * pAktNode = &aTmpIdx.GetNode(); - pAktNode->pStartOfSection = aSttNdStack[ aSttNdStack.size()-1 ]; + pAktNode->m_pStartOfSection = aSttNdStack[ aSttNdStack.size()-1 ]; if( pAktNode->GetStartNode() ) { @@ -1053,7 +1053,7 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn else if( aTmpIdx < aEnd ) // too many StartNodes // if the end is not reached, yet, get the start of the section above { - aSttNdStack.insert( aSttNdStack.begin(), pSttNd->pStartOfSection ); + aSttNdStack.insert( aSttNdStack.begin(), pSttNd->m_pStartOfSection ); } else // finished, as soon as out of the range break; @@ -1091,7 +1091,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes) // if aEnd is not on a ContentNode, search the previous one while( ( pAktNode = &aRg.aEnd.GetNode())->GetStartNode() || ( pAktNode->GetEndNode() && - !pAktNode->pStartOfSection->IsTableNode() )) + !pAktNode->m_pStartOfSection->IsTableNode() )) --aRg.aEnd; nCnt = 0; @@ -1114,11 +1114,11 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes) // delete the whole section? if( pAktNode->StartOfSectionIndex() > aRg.aStart.GetIndex() ) { - SwTableNode* pTableNd = pAktNode->pStartOfSection->GetTableNode(); + SwTableNode* pTableNd = pAktNode->m_pStartOfSection->GetTableNode(); if( pTableNd ) pTableNd->DelFrms(); - SwNode *pNd, *pChkNd = pAktNode->pStartOfSection; + SwNode *pNd, *pChkNd = pAktNode->m_pStartOfSection; sal_uInt16 nIdxPos; do { pNd = &aRg.aEnd.GetNode(); @@ -1136,8 +1136,8 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes) pTextNode->InvalidateNumRule(); } else if( pNd->IsEndNode() && - pNd->pStartOfSection->IsTableNode() ) - static_cast<SwTableNode*>(pNd->pStartOfSection)->DelFrms(); + pNd->m_pStartOfSection->IsTableNode() ) + static_cast<SwTableNode*>(pNd->m_pStartOfSection)->DelFrms(); --aRg.aEnd; nCnt++; @@ -1693,7 +1693,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, // skip "simple" StartNodes or EndNodes while( ND_STARTNODE == (pAktNode = & aRg.aStart.GetNode())->GetNodeType() || ( pAktNode->IsEndNode() && - !pAktNode->pStartOfSection->IsSectionNode() ) ) + !pAktNode->m_pStartOfSection->IsSectionNode() ) ) ++aRg.aStart; // if aEnd-1 points to no ContentNode, search previous one @@ -1706,7 +1706,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, while( ((pAktNode = & aRg.aEnd.GetNode())->GetStartNode() && !pAktNode->IsSectionNode() ) || ( pAktNode->IsEndNode() && - ND_STARTNODE == pAktNode->pStartOfSection->GetNodeType()) ) + ND_STARTNODE == pAktNode->m_pStartOfSection->GetNodeType()) ) { --aRg.aEnd; } @@ -1841,12 +1841,12 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange, --nLevel; ++aInsPos; // EndNode already exists } - else if( !pAktNode->pStartOfSection->IsSectionNode() ) + else if( !pAktNode->m_pStartOfSection->IsSectionNode() ) { // create a section at the original InsertPosition SwNodeRange aTmpRg( aOrigInsPos, 1, aInsPos ); pDoc->GetNodes().SectionDown( &aTmpRg, - pAktNode->pStartOfSection->GetStartNodeType() ); + pAktNode->m_pStartOfSection->GetStartNodeType() ); } break; @@ -1947,10 +1947,10 @@ SwContentNode* SwNodes::GoNextSection( SwNodeIndex * pIdx, } else if( bFirst ) { - if( pNd->pStartOfSection->IsSectionNode() ) + if( pNd->m_pStartOfSection->IsSectionNode() ) { const SwSection& rSect = static_cast<SwSectionNode*>(pNd-> - pStartOfSection)->GetSection(); + m_pStartOfSection)->GetSection(); if( (bSkipHidden && rSect.IsHiddenFlag()) || (bSkipProtect && rSect.IsProtectFlag()) ) // than skip the section @@ -1991,10 +1991,10 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx, pNd = & aTmp.GetNode(); if (ND_ENDNODE == pNd->GetNodeType()) { - if( pNd->pStartOfSection->IsSectionNode() ) + if( pNd->m_pStartOfSection->IsSectionNode() ) { const SwSection& rSect = static_cast<SwSectionNode*>(pNd-> - pStartOfSection)->GetSection(); + m_pStartOfSection)->GetSection(); if( (bSkipHidden && rSect.IsHiddenFlag()) || (bSkipProtect && rSect.IsProtectFlag()) ) // than skip section @@ -2005,10 +2005,10 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx, else if( bFirst ) { bFirst = false; - if( pNd->pStartOfSection->IsSectionNode() ) + if( pNd->m_pStartOfSection->IsSectionNode() ) { const SwSection& rSect = static_cast<SwSectionNode*>(pNd-> - pStartOfSection)->GetSection(); + m_pStartOfSection)->GetSection(); if( (bSkipHidden && rSect.IsHiddenFlag()) || (bSkipProtect && rSect.IsProtectFlag()) ) // than skip section diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index edb7710..f593c5f 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -526,7 +526,7 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd, { if( ( pNd = (*this)[ n ] )->IsContentNode() ) static_cast<SwContentNode*>(pNd)->DelFrms(); - pNd->pStartOfSection = pTableNd; + pNd->m_pStartOfSection = pTableNd; } } @@ -597,13 +597,13 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd, sal_uLong nEndNd, aEndIdx = pSave->m_nEndNd; SwStartNode* pSttNd = new SwStartNode( aSttIdx, ND_STARTNODE, SwTableBoxStartNode ); - pSttNd->pStartOfSection = pTableNd; + pSttNd->m_pStartOfSection = pTableNd; new SwEndNode( aEndIdx, *pSttNd ); for( sal_uLong i = aSttIdx.GetIndex(); i < aEndIdx.GetIndex()-1; ++i ) { pNd = (*this)[ i ]; - pNd->pStartOfSection = pSttNd; + pNd->m_pStartOfSection = pSttNd; if( pNd->IsStartNode() ) i = pNd->EndOfSectionIndex(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits