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

Julien Nabet serval2412 at yahoo.fr
Sun Nov 26 17:12:45 UTC 2017


 xmloff/source/chart/SchXMLSeries2Context.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5c2f6d9e2efe1015cfbf9d89a88ed940127c0a4f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 26 16:51:28 2017 +0100

    No need to test seriesStyle.m_xOldAPISeries n times (xmloff/chart)
    
    so move it out from the inner loop
    
    Change-Id: I367dc428b10ff4554b63ee3cdabfe65ddfb61ea7
    Reviewed-on: https://gerrit.libreoffice.org/45291
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 82b6662771c6..01e9027caf95 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -1014,6 +1014,10 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
         if( seriesStyle.m_nPointIndex == -1 )
             continue;
 
+        uno::Reference< beans::XPropertySet > xSeriesProp( seriesStyle.m_xOldAPISeries );
+        if(!xSeriesProp.is())
+            continue;
+
         //ignore datapoint properties for stock charts
         //... todo ...
         if( bIsStockChart )
@@ -1027,10 +1031,6 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
         {
             try
             {
-                uno::Reference< beans::XPropertySet > xSeriesProp( seriesStyle.m_xOldAPISeries );
-                if(!xSeriesProp.is())
-                    continue;
-
                 uno::Reference< beans::XPropertySet > xPointProp(
                     SchXMLSeriesHelper::createOldAPIDataPointPropertySet( seriesStyle.m_xSeries, seriesStyle.m_nPointIndex + i
                         , uno::Reference< frame::XModel >( rImportHelper.GetChartDocument(), uno::UNO_QUERY ) ) );


More information about the Libreoffice-commits mailing list