diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-07 13:26:23 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-07 19:06:21 -0400 |
| commit | af5a6615dfdbe5c2cacdcacb00fc6f418b925c06 (patch) | |
| tree | 48e7facd6485dee20fd2aec4dcccd3a782fcec0b | |
| parent | ff26976702079a353c5039843bfcc911bc46d0cd (diff) | |
Adjust for the splitting of number format properties in chart.
Since 1d38cb365543924f9c50014e6b2227e77de1d0c9, "number format" and
"link number format to source" properties are 2 separate properties. Adjust
OOXML import code for that split.
Also, always set axis' number format via NumberFormat property even when it's
a percent format. The axis object doesn't keep a non-percent and percent
number formats separately.
Change-Id: I8667b6f1a78d88cc37d059518919ad1b37f154e1
| -rw-r--r-- | oox/source/drawingml/chart/axisconverter.cxx | 8 | ||||
| -rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 8 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 1 |
3 files changed, 5 insertions, 12 deletions
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index d11f3273bd60..075f6a068736 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -301,13 +301,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo // number format ------------------------------------------------------ if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) || (aScaleData.AxisType == cssc2::AxisType::PERCENT) ) - { - bool bPercent = false; - if( mrModel.maNumberFormat.maFormatCode.indexOf('%') >= 0) - bPercent = true; - mrModel.maNumberFormat.mbSourceLinked = false; - getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent ); - } + getFormatter().convertNumberFormat(aAxisProp, mrModel.maNumberFormat, false); // position of crossing axis ------------------------------------------ diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 1fe5c758eddd..8fd7dc4ffb4f 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -1088,11 +1088,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo if( mxData->mxNumFmts.is() ) { sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : PROP_NumberFormat; - if( rNumberFormat.mbSourceLinked || rNumberFormat.maFormatCode.isEmpty() ) - { - rPropSet.setAnyProperty( nPropId, Any() ); - } - else try + try { sal_Int32 nIndex = rNumberFormat.maFormatCode.equalsIgnoreAsciiCase("general") ? mxData->mxNumTypes->getStandardIndex( mxData->maFromLocale ) : @@ -1105,6 +1101,8 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo OSL_FAIL( OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" ). append( OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() ); } + + rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.mbSourceLinked)); } } diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 0ad6d7a1a4c1..44c759715975 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -298,6 +298,7 @@ LineStartWidth LineStyle LineTransparence LineWidth +LinkNumberFormatToSource LinkURL LoadReadonly LookUpLabels |