diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-29 21:10:22 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-11 12:24:53 +0000 |
| commit | 2772bb0a1997c76be47d81d67678c907b28df650 (patch) | |
| tree | 11a6c38d621c1718827c9e3b701890c997aedb4a /oox | |
| parent | c76daf9b5f1efc44eaf6541314f122d641c791cc (diff) | |
Fix some number format issues, bnc#862510
Set "LinkNumberFormatToSource" to false, so that format code is not
ignored.
Also, do not inherit format code common for all labels, if there is
specific format code for a data label.
Change-Id: I505311d5df641d61e616e354734bd332609fa122
(cherry picked from commit c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7)
Reviewed-on: https://gerrit.libreoffice.org/10782
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/modelbase.cxx | 3 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index b3499456931d..eadde2b21d5d 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -34,8 +34,7 @@ NumberFormat::NumberFormat() : void NumberFormat::setAttributes( const AttributeList& rAttribs ) { maFormatCode = rAttribs.getString( XML_formatCode, OUString() ); - // default is 'false', not 'true' as specified - mbSourceLinked = rAttribs.getBool( XML_sourceLinked, false ); + // TODO: if XML_sourceLinked is true, <c:formatCode> should be used instead. } // ============================================================================ diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 8e91941ea7a8..a9911e752068 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -1128,7 +1128,9 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo append( OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() ); } - rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.mbSourceLinked)); + // Format code is ignored if "LinkNumberFormatToSource" is set to "true" :-/ + // See AxisHelper::getExplicitNumberFormatKeyForAxis() + rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.maFormatCode.isEmpty())); } } diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index dbd3201a3c98..2cccd3a0062b 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -234,9 +234,8 @@ void DataLabelsConverter::convertFromModel( const Reference< XDataSeries >& rxDa // data point label settings for( DataLabelsModel::DataLabelVector::iterator aIt = mrModel.maPointLabels.begin(), aEnd = mrModel.maPointLabels.end(); aIt != aEnd; ++aIt ) { - (*aIt)->maNumberFormat.maFormatCode = mrModel.maNumberFormat.maFormatCode; - if( !mrModel.maNumberFormat.maFormatCode.isEmpty() ) - (*aIt)->maNumberFormat.mbSourceLinked = false; + if ((*aIt)->maNumberFormat.maFormatCode.isEmpty()) + (*aIt)->maNumberFormat = mrModel.maNumberFormat; DataLabelConverter aLabelConv( *this, **aIt ); aLabelConv.convertFromModel( rxDataSeries, rTypeGroup ); |