sw/source/core/text/porfld.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 21473f46fda5f1c7f220493667a96fff7c78a7b3
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu May 25 14:15:57 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu May 25 15:53:02 2023 +0200

    sw: fix crashtesting assert on forum-mso-en-13115.docx
    
    itrpaint.cxx:436: SwTextPainter::DrawTextLine: Assertion 
`!roTaggedParagraph' failed.
    
    The problem is that there are 2 SwNumberPortion, and the 1st one doesn't
    have the m_bHasFollow flag set.
    
    The numbering suffix is 5 consecutive ' ' spaces, which is oddly enough
    considered a hook char in SwFieldPortion::Format() but not in
    SwTextFormatInfo::ScanPortionEnd().
    
    This inconsistency appears to cause the problem, and was already there
    in initial CVS import, but nothing bad seems to happen when it is
    resolved.
    
    (regression from commit 9b38beadf9eaf027b201cdf0ecb2bce5611014dd
     and commit df5328ff1e472af9c69d4ff83fa13c71d644ddec)
    
    Change-Id: I602d9adb63220cb63ce8a477b617e9aeae45fb8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152274
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 6142b0e9539b..e07747ff8a22 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -395,7 +395,6 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
                 switch (cNew)
                 {
                     case CH_BREAK:
-                    case ' ': // ??? why is this one not in ScanPortionEnd?
                     case CH_TAB:
                     case CHAR_HARDHYPHEN: // non-breaking hyphen
                     case CHAR_SOFTHYPHEN:

Reply via email to