[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/inc/wrong.hxx   |    3 ---
 sw/source/core/text/inftxt.cxx |    2 --
 2 files changed, 5 deletions(-)

New commits:
commit 32fb8d6a4be8187580bf228b74401f08b1209f92
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Apr 2 13:07:03 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 2 16:05:32 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.Stahl at cib.de>
    (cherry picked from commit a9f3cee384d9715d289a9a055f085c999b193d3c)
    Reviewed-on: https://gerrit.libreoffice.org/70137
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 8340d3337ca4..ec8106ea889d 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -379,9 +379,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 3bee295c6bd9..29ef2035bee7 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1773,7 +1773,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);
@@ -1802,7 +1801,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);