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

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/extlstcontext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a13b53e780f541ebd5ca1bf95c8b5c14df30516f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 15 09:53:45 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 15 11:37:11 2022 +0000

    crashtesting: relax assert seen in forum-mso-en4-503384.xlsx
    
    maModels.size() is 1 while maPriorities.size() is 2 with this
    offending xml
    
    <x14:conditionalFormatting 
xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main";>
     <x14:cfRule type="iconSet" priority="6" 
id="{8347056A-0193-48CE-A1F2-602B0108EE9E}">
      <x14:iconSet iconSet="3Symbols2" showValue="0" custom="1">
       <x14:cfvo type="percent">
        <xm:f>0</xm:f>
       </x14:cfvo>
       <x14:cfvo type="num" gte="0">
        <xm:f>0</xm:f>
       </x14:cfvo>
       <x14:cfvo type="num" gte="0">
        <xm:f>0</xm:f>
       </x14:cfvo>
       <x14:cfIcon iconSet="3Triangles" iconId="1"/>
       <x14:cfIcon iconSet="NoIcons" iconId="0"/>
       <x14:cfIcon iconSet="3Symbols2" iconId="2"/>
      </x14:iconSet>
     </x14:cfRule>
     <x14:cfRule type="expression" priority="1" 
id="{89F2044D-AD8D-477D-AFD2-3E2B711FFBCA}">
      
<xm:f>AND($A3&gt;INDEX(Sheet2!$B$2:$B$50,MATCH(C$2,Sheet2!$A$2:$A$50,0)),C3=1)</xm:f>
      <x14:dxf>
       <fill>
        <patternFill>
         <bgColor rgb="FF92D050"/>
        </patternFill>
       </fill>
      </x14:dxf>
     </x14:cfRule>
     <xm:sqref>C3:Q28</xm:sqref>
    </x14:conditionalFormatting>
    
    Change-Id: I3b530be9adaf8a9e98488e8dc25891721ff36244
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144212
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/oox/extlstcontext.cxx 
b/sc/source/filter/oox/extlstcontext.cxx
index 67d52fc69da9..45e60e7c6f5e 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -283,7 +283,7 @@ void ExtConditionalFormattingContext::onEndElement()
                     
maEntries.push_back(std::unique_ptr<ScFormatEntry>(pEntry));
                 }
 
-                assert(maModels.size() == maPriorities.size());
+                assert(maPriorities.size() >= maModels.size());
                 maModels.clear();
             }