From bd2458fe5ed936a76ee2b56584496d338d18a82b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 17 Oct 2017 09:40:49 +0200
Subject: Revert "sw: work around layout loop with split sections inside nested
 tables"

This reverts commit a3884863aba7807e7b473a0acb3f7aa4e4ae9a37. It was a
workaround, root cause fix is coming.
---
 sw/source/core/layout/tabfrm.cxx | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 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 );
-- 
cgit