diff options
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index c58261786a6b..8b5922c8a3e7 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1582,9 +1582,11 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) // format lowers, only if table frame is valid if ( pTab->isFrameAreaDefinitionValid() ) { + FlowFrameJoinLockGuard tabG(pTab); // tdf#124675 prevent Join() if pTab becomes empty SwLayoutFrame *pLow = static_cast<SwLayoutFrame*>(pTab->Lower()); while ( pLow ) { + SwFrameDeleteGuard rowG(pLow); // tdf#124675 prevent RemoveFollowFlowLine() bChanged |= FormatLayout( m_pImp->GetShell()->GetOut(), pLow, bAddRect ); if ( IsAgain() ) return false; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index a9667a964308..c78c5889d3b5 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -859,7 +859,7 @@ bool SwTabFrame::RemoveFollowFlowLine() if (pFollowFlowLine->IsDeleteForbidden()) { SAL_WARN("sw.layout", "Cannot remove in-use Follow Flow Line"); - return true; + return false; } // Move content |