[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/XMLTableShapeResizer.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 153a3587461ba8f14ac849d2f99d3985c0138cf3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 18 16:43:39 2020 +0000
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Nov 25 14:45:23 2020 +0100

    crashtesting: make tdf129410-1.ods not crash on load
    
    Give its multiple anonymous ChartListeners unique names
    
    Maybe ScMyOLEFixer::FixupOLEs should instead skip calling
    CreateChartListener if getPropertyValue(sPersistName) >>= sName succeeded
    but has an empty sName result.
    
    Change-Id: I0741694ee692aaa22e0441a5e09748eb67e8dbf4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106066
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106363
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 105bbb7cbeb5..1f9bc5cc774f 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -87,7 +87,8 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
         *pRefTokens, aRangeStr, pDoc, cSep, pDoc->GetGrammar());
     if (!pRefTokens->empty())
     {
-        ScChartListener* pCL(new ScChartListener(rName, pDoc, std::move(pRefTokens)));
+        OUString sName = !rName.isEmpty() ? rName : pCollection->getUniqueName("OLEFixer ");
+        ScChartListener* pCL(new ScChartListener(sName, pDoc, std::move(pRefTokens)));
 
         //for loading binary files e.g.
         //if we have the flat filter we need to set the dirty flag thus the visible charts get repainted