diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-02 13:07:03 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-02 14:09:40 +0200 |
| commit | a9f3cee384d9715d289a9a055f085c999b193d3c (patch) | |
| tree | cc0f0279062083057d826e5775c826fe238eb1ab | |
| parent | 3b518953a8141b0d5043c2f3996a92956fdc3a47 (diff) | |
sw_redlinehide: remove WrongListIterator::MergedOrSame asserts
There is a surprising recursion with 2 SwTextSlot on the stack, with 2
consecutive fields, and then the m_pOldGrammarCheckList is not the
SwTextNode's but a SubList of that, so the assert triggers spuriously.
SwExpandPortion::Paint(SwTextPaintInfo const&) const (this=0x7d61cc0, rInf=...) at sw/source/core/text/porexp.cxx:66
SwFieldPortion::Paint(SwTextPaintInfo const&) const (this=0x7d61cc0, rInf=...) at sw/source/core/text/porfld.cxx:437
SwLinePortion::PrePaint(SwTextPaintInfo const&, SwLinePortion const*) const (this=0x7d61cc0, rInf=..., pLast=0x6fa49d0) at sw/source/core/text/porlin.cxx:138
SwExpandPortion::Paint(SwTextPaintInfo const&) const (this=0x6fa49d0, rInf=...) at sw/source/core/text/porexp.cxx:78
Change-Id: I915f31ce6de57b6a4a051598428441ae6c86d264
Reviewed-on: https://gerrit.libreoffice.org/70131
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | sw/source/core/inc/wrong.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index f7e22615578e..3fe7cb7bf75b 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -378,9 +378,6 @@ public: const SwWrongArea* GetWrongElement(TextFrameIndex nStart); bool LooksUseful() { return m_pMergedPara || m_pWrongList; } - bool MergedOrSame(SwWrongList const*const pList) const { - return m_pMergedPara || m_pWrongList == pList; - } }; class WrongListIteratorCounter diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 4fe1bf96e9bb..d94fd1cca717 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1781,7 +1781,6 @@ SwTextSlot::SwTextSlot( { std::pair<SwTextNode const*, sal_Int32> pos(pNew->GetTextFrame()->MapViewToModel(nIdx)); SwWrongList const*const pSmartTags(pos.first->GetSmartTags()); - assert(m_pOldSmartTagList->MergedOrSame(pSmartTags)); if (pSmartTags) { const sal_uInt16 nPos = pSmartTags->GetWrongPos(pos.second); @@ -1810,7 +1809,6 @@ SwTextSlot::SwTextSlot( { std::pair<SwTextNode const*, sal_Int32> pos(pNew->GetTextFrame()->MapViewToModel(nIdx)); SwWrongList const*const pGrammar(pos.first->GetGrammarCheck()); - assert(m_pOldGrammarCheckList->MergedOrSame(pGrammar)); if (pGrammar) { const sal_uInt16 nPos = pGrammar->GetWrongPos(pos.second); |