diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-05 12:45:24 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-18 22:30:14 +0100 |
| commit | 24ec15a3b510c9950afa11b6fa7a2db17525ddfb (patch) | |
| tree | a23b3b3ddda51a8abb77ef6aec840bb73110a933 /sw | |
| parent | badd8b10588d39995164668dfc3956b81002e592 (diff) | |
sw_redlinehide_4b: fix wrong assert in AppendObjs()
Clearly this is wrong, the first node might be deleted; triggered e.g.
by ooo69593-1.odt.
Change-Id: I8f491372fcc375e68f2f7611924d8d4c7f673f17
(cherry picked from commit e41374f64daf7b513842866cc2dcdfa3a9d3c0a5)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index e379c01c8375..f1c11bb23103 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1171,7 +1171,7 @@ void AppendObjs(const SwFrameFormats *const pTable, sal_uLong const nIndex, } else { - assert(nIndex == iter->pNode->GetIndex()); // first iteration + assert(pMerged->pParaPropsNode == iter->pNode); // first iteration } pNode = iter->pNode; iterFirst = iter; |