|
 |
f0633d |
From e8ac85752a2e07ceacb3b2f3e4eab3bc35a45c3d Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Muthu Subramanian <sumuthu@collabora.com>
|
|
|
f0633d |
Date: Tue, 22 Oct 2013 15:13:41 +0530
|
|
|
f0633d |
Subject: [PATCH 1/9] n#839727 / rhbz#1038176 Crash fix
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit e5f24e0c7c8f4799223c19359f4228f0b1a71461)
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I8d733afbbc05900c68217ead44de798c1263ca84
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7309
|
|
|
f0633d |
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f0633d |
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
oox/source/drawingml/chart/seriesconverter.cxx | 3 ++-
|
|
|
f0633d |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
|
|
|
f0633d |
index 9ef1f3f..020b141 100644
|
|
|
f0633d |
--- a/oox/source/drawingml/chart/seriesconverter.cxx
|
|
|
f0633d |
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
|
|
|
f0633d |
@@ -632,7 +632,8 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve
|
|
|
f0633d |
{
|
|
|
f0633d |
// Use number format code from Value series
|
|
|
f0633d |
DataSourceModel* pValues = mrModel.maSources.get( SeriesModel::VALUES ).get();
|
|
|
f0633d |
- xLabels->maNumberFormat.maFormatCode = pValues->mxDataSeq->maFormatCode;
|
|
|
f0633d |
+ if( pValues )
|
|
|
f0633d |
+ xLabels->maNumberFormat.maFormatCode = pValues->mxDataSeq->maFormatCode;
|
|
|
f0633d |
}
|
|
|
f0633d |
DataLabelsConverter aLabelsConv( *this, *xLabels );
|
|
|
f0633d |
aLabelsConv.convertFromModel( xDataSeries, rTypeGroup );
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|