diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-09-26 16:22:05 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-09-26 16:25:30 +0200 |
| commit | daff51e125d1036895a5d39a7a652b3f5ff0e97e (patch) | |
| tree | 319bd5ea1a3602d9116323aa3c6baefac38e7e40 /sw | |
| parent | d527a2eaee4ecbcc80ac019f78da9f14ac49060a (diff) | |
revert the change of SwCntntNode bases, for now
Smoketest fails because of this, presumably there is some old-style
C cast that fails to adjust the pointer value in SwModify* -> SwCntntNode*
casts because of missing the header file *sigh* , but I can't find
it now.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/node.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 583b8e6ce617..597f02e626a1 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -376,7 +376,7 @@ private: // -------------------- // SwCntntNode // -------------------- -class SW_DLLPUBLIC SwCntntNode: public SwNode, public SwModify, public SwIndexReg +class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg { //FEATURE::CONDCOLL diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 0f76a22eced5..b1bb09667f4f 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -993,8 +993,8 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd ) SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, SwFmtColl *pColl ) - : SwNode( rWhere, nNdType ), - SwModify( pColl ), // CrsrsShell, FrameFmt, + : SwModify( pColl ), // CrsrsShell, FrameFmt, + SwNode( rWhere, nNdType ), pCondColl( 0 ), mbSetModifyAtAttr( false ) { |