[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xepivotxml.cxx |    2 +-
 sc/source/ui/docshell/docfunc.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 90cbe517ad21c5425516f0b2441504c33abfe50a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jun 14 10:35:38 2022 +0100
Commit:     Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Wed Apr 19 10:26:47 2023 +0200

    don't assert on exporting forum-mso-de-104384.xlsx to xlsx
    
    a case of this -2 is also mentioned in
    
    commit 97af58093978d8e6b9d90eedcc59141304e7200e
    Date:   Fri Apr 5 22:04:13 2019 +0530
    
        tdf#123421 : xlsx export : Don't write data field entry...
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135817
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 2f30596347b12a7d0b9b78a1e4e2bc50eca9223a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135890
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    
    Change-Id: Ieded6035539df9d3896f2f08cf03c195082d4987

diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index e5af3d924863..770e6fbbe717 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -1118,7 +1118,7 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
         for (const auto& rDataField : aDataFields)
         {
             long nDimIdx = rDataField.mnPos;
-            assert(aCachedDims[nDimIdx]); // the loop above should have 
screened for NULL's.
+            assert(nDimIdx == -2 || aCachedDims[nDimIdx]); // the loop above 
should have screened for NULL's, skip check for -2 "data field"
             const ScDPSaveDimension& rDim = *rDataField.mpDim;
             boost::optional<OUString> pName = rDim.GetLayoutName();
             // tdf#124651: despite being optional in CT_DataField according to 
ECMA-376 Part 1,
commit 4234a4d5c2f6d644b82c255c21f6508287634bd2
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 12 14:10:27 2020 +0200
Commit:     Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Wed Apr 19 10:26:46 2023 +0200

    crashtesting: convert assert to SAL_WARN_IF
    
    Change-Id: I70a9922960dee978be05218ebf16a8186c3bc0c8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88524
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 2922d3ccc3b4..21b5986371f9 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1366,7 +1366,7 @@ ScPostIt* ScDocFunc::ImportNote( const ScAddress& rPos, 
const OUString& rNoteTex
     ScDocument& rDoc = rDocShell.GetDocument();
 
     std::unique_ptr<ScPostIt> pOldNote = rDoc.ReleaseNote( rPos );
-    assert(!pOldNote && "imported data has >1 notes on same cell?");
+    SAL_WARN_IF(pOldNote, "sc.ui", "imported data has >1 notes on same cell? 
at pos " << rPos);
 
     // create new note
     ScPostIt* pNewNote = nullptr;