diff options
Diffstat (limited to 'sw/source/core/layout/softpagebreak.cxx')
| -rw-r--r-- | sw/source/core/layout/softpagebreak.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx index 96f91903ddfb..dcf25b321b21 100644 --- a/sw/source/core/layout/softpagebreak.cxx +++ b/sw/source/core/layout/softpagebreak.cxx @@ -25,10 +25,10 @@ #include "tabfrm.hxx" #include <calbck.hxx> -void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const +void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const { - SwIterator<SwTxtFrm,SwTxtNode> aIter( *this ); - for( const SwTxtFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) + SwIterator<SwTextFrm,SwTextNode> aIter( *this ); + for( const SwTextFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) { // No soft page break in header or footer if( pFrm->FindFooterOrHeader() || pFrm->IsInFly() ) @@ -40,7 +40,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const // No soft page break at the first page if( pPage && pPage->GetPrev() ) { - const SwCntntFrm* pFirst2 = pPage->FindFirstBodyCntnt(); + const SwContentFrm* pFirst2 = pPage->FindFirstBodyContent(); // Special handling for content frame in table frames if( pFrm->IsInTab() ) { @@ -75,7 +75,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const const SwFrm* pCell = pRow->Lower(); while( pCell ) { - pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsCntnt(); + pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsContent(); if( pFirst2 == pFrm ) { // Here we are: a first content inside a cell // inside the splitted row => soft page break @@ -96,9 +96,9 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const bool SwTableLine::hasSoftPageBreak() const { // No soft page break for sub tables - if( GetUpper() || !GetFrmFmt() ) + if( GetUpper() || !GetFrameFormat() ) return false; - SwIterator<SwRowFrm,SwFmt> aIter( *GetFrmFmt() ); + SwIterator<SwRowFrm,SwFormat> aIter( *GetFrameFormat() ); for( SwRowFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->GetTabLine() == this ) @@ -118,7 +118,7 @@ bool SwTableLine::hasSoftPageBreak() const // No soft page break at the first page of the document if( pPage && !pPage->GetPrev() ) return false; - const SwCntntFrm* pFirst = pPage ? pPage->FindFirstBodyCntnt() : NULL; + const SwContentFrm* pFirst = pPage ? pPage->FindFirstBodyContent() : NULL; // No soft page break for // tables which does not contain the first body content of the page if( !pFirst || !pTab->IsAnLower( pFirst->FindTabFrm() ) ) |