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

[Caolán McNamara (via logerrit)]

 editeng/source/rtf/svxrtf.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 71c4c0628570b960c9d6ba14222e1b1324447937
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 24 16:07:18 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 25 09:39:25 2021 +0200

    assert on calc rtf import at svl::detail::validRange(nFrom, nTo)
    
    Change-Id: I4513be06ff70605db8b386dc261c5b82509759e8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120953
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 1d1c0993a5d1..6b878cca119c 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -921,6 +921,8 @@ void SvxRTFParser::BuildWhichTable()
     {
         sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false);
         aPardMap[nWid] = nTrueWid;
+        if (nTrueWid == 0)
+            continue;
         aWhichMap = aWhichMap.MergeRange(nTrueWid, nTrueWid);
     }
 
@@ -943,6 +945,8 @@ void SvxRTFParser::BuildWhichTable()
     {
         sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false);
         aPlainMap[nWid] = nTrueWid;
+        if (nTrueWid == 0)
+            continue;
         aWhichMap = aWhichMap.MergeRange(nTrueWid, nTrueWid);
     }
 }