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

[Julien Nabet]

 oox/source/drawingml/chart/typegroupconverter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf330b7f20ad6e7992bb6bc387e12183acdb3082
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Mar 31 09:01:32 2018 +0200

    No need to test var at each loop (oox/typegroupconverter)
    
    Just test it when its value may change
    
    Change-Id: Id721e04d436f0d1d33b8fb45ccfe0eb3896eea43
    Reviewed-on: https://gerrit.libreoffice.org/52179
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index fb8a50f0203b..06881672492b 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -276,6 +276,8 @@ Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence()
         {
             SeriesConverter aSeriesConv(*this, *elem);
             xLabeledSeq = aSeriesConv.createCategorySequence( "categories" );
+            if (xLabeledSeq.is())
+                break;
         }
         else if( nMaxValues <= 0 && elem->maSources.has( SeriesModel::VALUES ) )
         {
@@ -283,8 +285,6 @@ Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence()
             if( pValues->mxDataSeq.is() )
                 nMaxValues = pValues->mxDataSeq.get()->maData.size();
         }
-        if (xLabeledSeq.is())
-            break;
     }
     /* n#839727 Create Category Sequence when none are found */
     if( !xLabeledSeq.is() && mrModel.maSeries.size() > 0 ) {