diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-11 08:56:22 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-11 22:47:59 +0200 |
| commit | d22a4d945ccf1456fbdb2c39802d956afa583a2a (patch) | |
| tree | d32a5c95434de267d8473f24413f80f106bc9a6a /oox/inc | |
| parent | 1387027aa9acf9e62f2d7bf50f71a5889626d194 (diff) | |
bnc#892610: OOXML import: Improve chart number formats.
If sourceLinked is used, do not set "PercentageNumberFormat" even if
showPercent is true. The format string should be used for "NumberFormat".
c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7 unnecessarily disabled
"LinkNumberFormatToSource". Use that for data labels but not for axis.
Also, actually make attaching number format supplier work for Calc.
Previously, non standard formats were added into wrong supplier,
and they were thrown away later because it was attached too late.
(See also ChartModel::attachNumberFormatsSupplier)
Change-Id: Iaf9945abc3d82d0ac63d9f36b8888eb49f39ab57
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/chart/objectformatter.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx index ebe5a01d8991..d3a6a6d1668c 100644 --- a/oox/inc/drawingml/chart/objectformatter.hxx +++ b/oox/inc/drawingml/chart/objectformatter.hxx @@ -131,7 +131,8 @@ public: void convertNumberFormat( PropertySet& rPropSet, const NumberFormat& rNumberFormat, - bool bPercentFormat = false ); + bool bAxis, + bool bShowPercent = false ); /** Sets automatic fill properties to the passed property set. */ void convertAutomaticFill( |