diff options
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 0a336f9cbe76..0c6db983d50d 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4319,43 +4319,6 @@ SwTwips SwRowFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo ) return nReal; } -static bool lcl_ContainsNestedTableContainingSection(SwRowFrame* pRow) -{ - SwFrame* pLower = pRow->Lower(); - if (!pLower) - return false; - if (!pLower->IsCellFrame()) - return false; - SwCellFrame* pOuterCell = static_cast<SwCellFrame*>(pLower); - - pLower = pOuterCell->Lower(); - if (!pLower) - return false; - if (!pLower->IsTabFrame()) - return false; - SwTabFrame* pInnerTab = static_cast<SwTabFrame*>(pLower); - - pLower = pInnerTab->Lower(); - if (!pLower) - return false; - if (!pLower->IsRowFrame()) - return false; - SwRowFrame* pInnerRow = static_cast<SwRowFrame*>(pLower); - - pLower = pInnerRow->Lower(); - if (!pLower) - return false; - if (!pLower->IsCellFrame()) - return false; - SwCellFrame* pInnerCell = static_cast<SwCellFrame*>(pLower); - - pLower = pInnerCell->Lower(); - if (!pLower) - return false; - - return pLower->IsSctFrame(); -} - SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) { SWRECTFN( this ) @@ -4444,8 +4407,7 @@ SwTwips SwRowFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) && !pTab->IsInRecalcLowerRow() ) { SwTabFrame* pMasterTab = pTab->FindMaster(); - if (!lcl_ContainsNestedTableContainingSection(this)) - pMasterTab->InvalidatePos(); + pMasterTab->InvalidatePos(); } } AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, true ); |