diff options
Diffstat (limited to 'sw/source/core/layout/layact.cxx')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 74fe4e85bcfd..96796cca4662 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -261,10 +261,7 @@ SwLayAction::SwLayAction( SwRootFrame *pRt, SwViewShellImp *pI ) : m_nStartTicks( std::clock() ), m_nInputType( VclInputFlags::NONE ), m_nEndPage( USHRT_MAX ), - m_nCheckPageNum( USHRT_MAX ), - m_pCurPage( nullptr ), - m_nTabLevel( 0 ), - m_nCallCount( 0 ) + m_nCheckPageNum( USHRT_MAX ) { m_bPaintExtraData = ::IsExtraData( m_pImp->GetShell()->GetDoc() ); m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true; @@ -292,7 +289,6 @@ void SwLayAction::Reset() m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true; m_bInput = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = m_bReschedule = m_bUpdateExpFields = m_bBrowseActionStop = false; - m_pCurPage = nullptr; } bool SwLayAction::RemoveEmptyBrowserPages() @@ -1183,12 +1179,6 @@ bool SwLayAction::IsShortCut( SwPageFrame *&prPage ) // introduce support for vertical layout bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLay, bool bAddRect ) { - // save page for loop control - if( pLay->IsPageFrame() && static_cast<SwPageFrame*>(pLay) != m_pCurPage ) - { - m_nCallCount = 0; - m_pCurPage = static_cast<SwPageFrame*>(pLay); - } OSL_ENSURE( !IsAgain(), "Attention to the invalid page." ); if ( IsAgain() ) return false; @@ -1369,14 +1359,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa { if ( pLow->IsTabFrame() ) { - // loop control for embedded tables - if ( m_nTabLevel > 0 && ++m_nCallCount > 50 ) { - static_cast<SwTabFrame*>(pLow)->SetSplitRowDisabled(); - } - - ++m_nTabLevel; bTabChanged |= FormatLayoutTab( static_cast<SwTabFrame*>(pLow), bAddRect ); - --m_nTabLevel; } // Skip the ones already registered for deletion else if( !pLow->IsSctFrame() || static_cast<SwSectionFrame*>(pLow)->GetSection() ) |