summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-06-18 17:51:43 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2019-06-19 10:29:24 +0200
commit1e6dec4b4313212a3bdc6bb06155fd65e795368b (patch)
tree847a87d300889253ded0ca683c813b82d94fe1e4 /sw/source/core/inc
parent1dade9d64dc579e4e68c033a539b3df25dc89f3e (diff)
sw: fix assert on layout of ooo63564-1.odt
The problem is that some SwTextFrames (1415 in particular) inside the follow-flow-row of a table move backwards, during(!) which the follow-flow-row is deleted; i.e., the SwTextFrame was already moved backwards by the pNewUpper->Calc() in MoveBwd(), then it is Cut and Pasted at the end of pNewUpper, when it is actually already a lower, somewhere in the middle... This triggers the assert in SwFrame::PrepareMake() that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b Prevent this by using the IsDeleteForbidden() check that was introduced in commit 0005b330eaed0b5559042d2597fb45e0c9125d7e; this is similar to how MoveBwd() already locks section frames to prevent such problems. Ultimately a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50. Change-Id: I893ec3e491b4cbe1569edf97fec31d3dd74548ed Reviewed-on: https://gerrit.libreoffice.org/74298 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source/core/inc')
0 files changed, 0 insertions, 0 deletions