From 01a892dcba8b4869f8a6c8e5aaf4b5ed09e81bd7 Mon Sep 17 00:00:00 2001 From: Marco Cecchetti Date: Tue, 8 Aug 2017 13:04:02 +0200 Subject: bug fix: tdf#111173 Mostly based on a patch by Julien Nabet: http://bugs.documentfoundation.org/attachment.cgi?id=135107 Thanks Julien! Change-Id: I02440be7dfa5881e5bf63710a9d3c4f261d00533 Reviewed-on: https://gerrit.libreoffice.org/40878 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- chart2/source/view/charttypes/PieChart.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'chart2') diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index d91e5a10d3fd..f3b854ee8707 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -362,8 +362,13 @@ void PieChart::createTextLabelShape( ///a new `PieLabelInfo` instance is initialized with all the info related to ///the current label in order to simplify later label position rearrangement; uno::Reference< container::XChild > xChild( aPieLabelInfo.xTextShape, uno::UNO_QUERY ); - if( xChild.is() ) - aPieLabelInfo.xLabelGroupShape.set( xChild->getParent(), uno::UNO_QUERY ); + + ///text shape could be empty; in that case there is no need to add label info + if( !xChild.is() ) + return; + + aPieLabelInfo.xLabelGroupShape.set( xChild->getParent(), uno::UNO_QUERY ); + aPieLabelInfo.fValue = nVal; aPieLabelInfo.bMovementAllowed = bMovementAllowed; aPieLabelInfo.bMoved= false; @@ -374,9 +379,7 @@ void PieChart::createTextLabelShape( performLabelBestFit(rParam, aPieLabelInfo); } - m_aLabelInfoList.push_back(aPieLabelInfo); - } void PieChart::addSeries( VDataSeries* pSeries, sal_Int32 /* zSlot */, sal_Int32 /* xSlot */, sal_Int32 /* ySlot */ ) -- cgit