diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-10-09 12:44:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-10-09 12:46:10 +0200 |
| commit | 8b490c17243248e2824633d0438b0fc290d94f9b (patch) | |
| tree | 24ec5678319fb0f6db5ecc56ad054d5484918adc /sw | |
| parent | 2a64f24417a15d6963235bc0d6c836e853c9dfd1 (diff) | |
tdf#112942: Apparently, rTab.GetFollow() can change in between
...the calls to TableSplitRecalcLock and TableSplitRecalcUnlock
Change-Id: Iacb0d88ccb323fb248129daeeeb207b25f148753
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index efcc0df63223..ec2e72209252 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -662,7 +662,7 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame& rFollowLine, // Lock this tab frame and its follow bool bUnlockMaster = false; - bool bUnlockFollow = false; + SwFlowFrame * bUnlockFollow = nullptr; SwTabFrame* pMaster = rTab.IsFollow() ? rTab.FindMaster() : nullptr; if ( pMaster && !pMaster->IsJoinLocked() ) { @@ -671,8 +671,8 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame& rFollowLine, } if ( !rTab.GetFollow()->IsJoinLocked() ) { - bUnlockFollow = true; - ::TableSplitRecalcLock( rTab.GetFollow() ); + bUnlockFollow = rTab.GetFollow(); + ::TableSplitRecalcLock( bUnlockFollow ); } bool bInSplit = rLastLine.IsInSplit(); @@ -689,7 +689,7 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame& rFollowLine, // Unlock this tab frame and its follow if ( bUnlockFollow ) - ::TableSplitRecalcUnlock( rTab.GetFollow() ); + ::TableSplitRecalcUnlock( bUnlockFollow ); if ( bUnlockMaster ) ::TableSplitRecalcUnlock( pMaster ); |