diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-01 18:46:02 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-01 18:46:02 +0100 |
| commit | a4ec5de5ed537604ef0229990dc449821ad13a4f (patch) | |
| tree | 0f2a81b02830848e2e2a8025e26a7f4a3945568d /sw | |
| parent | 6f79559e1f91b4738f5227651eb1c6c23a14cd19 (diff) | |
SwNode: reorder that to avoid -Werror=reorder
Change-Id: Ic58a5503dc6b7991c8804feef05b814d1055bfb9
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/node.hxx | 10 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 003d7b615dca..35ba3f226ef2 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -91,11 +91,6 @@ class SW_DLLPUBLIC SwNode { friend class SwNodes; -#ifdef DBG_UTIL - static long s_nSerial; - long m_nSerial; -#endif - sal_uInt8 nNodeType; /// For text nodes: level of auto format. Was put here because we had still free bits. @@ -103,6 +98,11 @@ class SW_DLLPUBLIC SwNode bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent. bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag +#ifdef DBG_UTIL + static long s_nSerial; + long m_nSerial; +#endif + protected: SwStartNode* pStartOfSection; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 98afd80ecc7b..eea21de11463 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -309,10 +309,10 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType ) , nAFmtNumLvl( 0 ) , bSetNumLSpace( false ) , bIgnoreDontExpand( false) - , pStartOfSection( 0 ) #ifdef DBG_UTIL , m_nSerial( s_nSerial++) #endif + , pStartOfSection( 0 ) { SwNodes& rNodes = const_cast<SwNodes&> (rWhere.GetNodes()); if( rWhere.GetIndex() ) @@ -341,10 +341,10 @@ SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNdType ) , nAFmtNumLvl( 0 ) , bSetNumLSpace( false ) , bIgnoreDontExpand( false) - , pStartOfSection( 0 ) #ifdef DBG_UTIL - ,m_nSerial( s_nSerial++) + , m_nSerial( s_nSerial++) #endif + , pStartOfSection( 0 ) { if( nPos ) { |