chart2/source/tools/DiagramHelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59dc59bb6e50d6d42d9fd6b82a165069d6e4bdbf
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 28 20:09:27 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 11:43:02 2022 +0100

    crashtesting: failure on import of ooo64618-1.ods
    
    since:
    
    commit 98f360b261d7b36fa63b10fadb86cf6f381cbd36
    Date:   Fri Jan 21 18:43:59 2022 +0200
    
        use more concrete types in chart2, BaseCoordinateSystem
    
    where the old situation was that the empty xDiagram caused
        Reference<XCoordinateSystemContainer> xCooSysCnt(xDiagram, 
uno::UNO_QUERY_THROW);
    to throw and get caught in the catch block of this try
    
    Change-Id: Id38793c28ccaf03bb84a7e8939ab76400092f002
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129125
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index a7589001524f..d53f9210a57f 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -689,7 +689,7 @@ std::vector< Reference< XAxis > > 
lcl_getAxisHoldingCategoriesFromDiagram(
 
     // return first x-axis as fall-back
     Reference< XAxis > xFallBack;
-    try
+    if (xDiagram.is()) try
     {
         for( rtl::Reference< BaseCoordinateSystem > const & xCooSys : 
xDiagram->getBaseCoordinateSystems() )
         {

Reply via email to