chart2/source/view/charttypes/PieChart.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 05c3791710397346aae0b2a9cca1792567941d62
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Tue Aug 8 13:04:02 2017 +0200
bug fix: tdf#111173
Mostly based on patch by Julien Nabet:
http://bugs.documentfoundation.org/attachment.cgi?id=135107
Thanks Julien!
Change-Id: I02440be7dfa5881e5bf63710a9d3c4f261d00533
Reviewed-on: https://gerrit.libreoffice.org/40877
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index aac461c914d5..35f1d84bc006 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -354,8 +354,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;
@@ -366,9 +371,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 */ )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
