From 2772bb0a1997c76be47d81d67678c907b28df650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Tue, 29 Jul 2014 21:10:22 +0200 Subject: [PATCH 092/137] 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 Tested-by: Tor Lillqvist --- oox/source/drawingml/chart/modelbase.cxx | 3 +-- oox/source/drawingml/chart/objectformatter.cxx | 4 +++- 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 b349945..eadde2b 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, should be used instead. } // ============================================================================ diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 8e91941..a9911e7 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 dbd3201..2cccd3a 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 ); -- 1.9.3