summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2013-04-25 17:37:32 +0530
committerAndras Timar <atimar@suse.com>2013-04-25 15:47:54 +0200
commitaf6299687ef968a3731cbfa24c3820f5006b2823 (patch)
tree4c384506c041470beacd763f6de7d35177e06dc6
parent138156f285ca2c08ef22b68c1e797bf5c5b7a61c (diff)
n#813291: [PPTX] Axis Labels with percentage.
Added the check only in the Axis Labels import. Maybe this check can be moved to convertNumberFormat() Conflicts: oox/source/drawingml/chart/axisconverter.cxx Change-Id: I40adfa5e79292b45e97f617dbe2b9880af71be07
-rw-r--r--oox/source/drawingml/chart/axisconverter.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index d07d28c79ae8..887df653d9e7 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -316,9 +316,13 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) || (aScaleData.AxisType == cssc2::AxisType::PERCENT) )
{
+ bool bPercent = false;
if( mrModel.maNumberFormat.maFormatCode.indexOfAsciiL("%",1) >= 0)
+ {
mrModel.maNumberFormat.mbSourceLinked = false;
- getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat );
+ bPercent = true;
+ }
+ getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent );
}
// position of crossing axis ------------------------------------------