summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/tabfrm.cxx
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2019-05-07 17:22:41 +0200
committerLászló Németh <nemeth@numbertext.org>2019-05-08 11:45:49 +0200
commit91b2239783dc716bd71ce7962bfd7e341dfe4175 (patch)
tree8d819f2b9cd829a6ff5d7ac7b97fac35a91bc5a3 /sw/source/core/layout/tabfrm.cxx
parent230cb99604aba01153d713ff86e7f8175792ac68 (diff)
tdf#116501 fix freezing at embedded text tables
by disabling their in-row splitting using loop control. Change-Id: Ibd93213fa0ce45458ce188de20da982e4abc17c5 Reviewed-on: https://gerrit.libreoffice.org/71920 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
-rw-r--r--sw/source/core/layout/tabfrm.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 060a8dcf6de3..a9667a964308 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -80,6 +80,7 @@ SwTabFrame::SwTabFrame( SwTable &rTab, SwFrame* pSib )
, m_bConsiderObjsForMinCellHeight(true)
, m_bObjsDoesFit(true)
, m_bInRecalcLowerRow(false)
+ , m_bSplitRowDisabled(false)
{
mbFixSize = false; //Don't fall for import filter again.
mnFrameType = SwFrameType::Tab;
@@ -118,6 +119,7 @@ SwTabFrame::SwTabFrame( SwTabFrame &rTab )
, m_bConsiderObjsForMinCellHeight(true)
, m_bObjsDoesFit(true)
, m_bInRecalcLowerRow(false)
+ , m_bSplitRowDisabled(false)
{
mbFixSize = false; //Don't fall for import filter again.
mnFrameType = SwFrameType::Tab;
@@ -1018,7 +1020,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK
// table, or it will be set to false under certain
// conditions that are not suitable for splitting
// the row.
- bool bSplitRowAllowed = pRow->IsRowSplitAllowed();
+ bool bSplitRowAllowed = pRow->IsRowSplitAllowed() && !IsSplitRowDisabled();
// #i29438#
// #i26945# - Floating screen objects no longer forbid