diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
| commit | 749c27fafbe1e57b7ba25f759272c02de20469e0 (patch) | |
| tree | d6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/source/core/doc/fmtcol.cxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/source/core/doc/fmtcol.cxx')
| -rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 030ab6bc311c..19638c159bc1 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -357,15 +357,9 @@ sal_Bool SwTxtFmtColl::IsAtDocNodeSet() const { SwIterator<SwCntntNode,SwFmtColl> aIter( *this ); const SwNodes& rNds = GetDoc()->GetNodes(); -<<<<<<< local for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() ) if( &(pNode->GetNodes()) == &rNds ) - return TRUE; -======= - for( SwClient* pC = aIter.First(TYPE(SwCntntNode)); pC; pC = aIter.Next() ) - if( &((SwCntntNode*)pC)->GetNodes() == &rNds ) return sal_True; ->>>>>>> other return sal_False; } |