summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/ssfrm.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-12 22:16:53 +0100
committerMichael Stahl <mstahl@redhat.com>2012-02-13 00:25:06 +0100
commita9f6e5323eaa3078f0a3a00a37cee169ba7dedbc (patch)
tree706d87d885fb5d6c1cccca873c54aea5a1d4b7a6 /sw/source/core/layout/ssfrm.cxx
parent657c500e2e9e9ad2e38e9da278b20fb82c109001 (diff)
fdo#41712: sw: remove superfluous flag:
This removes SwFlowFrm::bIsFollow, which is pointless duplication of m_pPrecede; this fixes lots of assertions (probably some real problem as well).
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
-rw-r--r--sw/source/core/layout/ssfrm.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index adc552d4b6cc..d0515efd9310 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -518,13 +518,10 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode )
dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) );
}
}
- if( pFrm->HasFollow() )
- pFrm->GetFollow()->_SetIsFollow( pFrm->IsFollow() );
if( pFrm->IsFollow() )
{
SwCntntFrm* pMaster = (SwTxtFrm*)pFrm->FindMaster();
pMaster->SetFollow( pFrm->GetFollow() );
- pFrm->_SetIsFollow( sal_False );
}
pFrm->SetFollow( 0 );//Damit er nicht auf dumme Gedanken kommt.
//Andernfalls kann es sein, dass ein Follow