sw/source/core/inc/wrong.hxx | 3 --- sw/source/core/text/inftxt.cxx | 2 -- 2 files changed, 5 deletions(-)
New commits: commit 8134553350679ac9728362e1f51197f45541a637 Author: Michael Stahl <michael.st...@cib.de> AuthorDate: Tue Apr 2 13:07:03 2019 +0200 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Wed Apr 10 12:52:01 2019 +0200 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.st...@cib.de> (cherry picked from commit a9f3cee384d9715d289a9a055f085c999b193d3c) diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 6944dfdac5be..0e44e22e109d 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -320,9 +320,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 5c7faa1b8511..16269e278350 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1755,7 +1755,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); @@ -1784,7 +1783,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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits