[Libreoffice-commits] core.git: editeng/source

[Caolán McNamara (via logerrit)]

 editeng/source/rtf/rtfitem.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 4b608064ef1af9e3ded464670832fa4de0ed75a8
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 26 16:05:36 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Apr 27 10:41:42 2022 +0200

    ofz#24932 Timeout
    
    Change-Id: I8eff4cee1ba06c7ad69cb6ec8e483a84cfd3a347
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133451
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 36e9bd16836e..bd75fe465567 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1114,6 +1114,16 @@ ATTR_SETEMPHASIS:
                             }
                             break;
 
+                        // We expect these to be preceeded by a RTF_HYPHEN and
+                        // so normally are handled by the RTF_HYPHEN case, but
+                        // if they appear 'bare' in a document then safely skip
+                        // them here
+                        case RTF_HYPHLEAD:
+                        case RTF_HYPHTRAIL:
+                        case RTF_HYPHMAX:
+                            SkipGroup();
+                            break;
+
                         case RTF_SHADOW:
                             {
                                 bool bSkip = true;