diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-04-28 23:58:29 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-04-29 00:15:01 +0200 |
| commit | 672398d84dcebba71ba996b07c7d47bb4257efef (patch) | |
| tree | 4015021b18d371d8008b764ce3663278bc1b28cc /oox | |
| parent | 33671ee41300d762c8fc7a674a60efe152fffd45 (diff) | |
order of element matters in OOXML export
this fixes one validation error with documents containing charts
Change-Id: I879963484b1cc00322e8c79bf77dfbbf91869587
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ea872b43e566..128ecebabfe7 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2352,24 +2352,24 @@ void ChartExport::exportDataLabels( pFS->singleElement( FSNS( XML_c, XML_idx), XML_val, I32S(nElem), FSEND); pFS->singleElement( FSNS( XML_c, XML_dLblPos), XML_val, aPlacement, FSEND); - if (GetProperty( xPropSet, "LabelSeparator")) - { - mAny >>= aSep; - pFS->singleElement( FSNS( XML_c, XML_separator), XML_val, USS(aSep), FSEND); - } - pFS->singleElement( FSNS( XML_c, XML_showLegendKey), XML_val, aLabel.ShowLegendSymbol ? "1" : "0", FSEND); pFS->singleElement( FSNS( XML_c, XML_showVal), XML_val, aLabel.ShowNumber ? "1" : "0", FSEND); pFS->singleElement( FSNS( XML_c, XML_showCatName), XML_val, aLabel.ShowCategoryName ? "1" : "0", FSEND); - pFS->singleElement( FSNS( XML_c, XML_showPercent), XML_val, - aLabel.ShowNumberInPercent ? "1" : "0", FSEND); // MSO somehow assumes series name to be on (=displayed) by default. // Let's put false here and switch it off then, since we have no UI means // in LibO to toggle it on anyway pFS->singleElement( FSNS( XML_c, XML_showSerName), XML_val, "0", FSEND); + pFS->singleElement( FSNS( XML_c, XML_showPercent), XML_val, + aLabel.ShowNumberInPercent ? "1" : "0", FSEND); + + if (GetProperty( xPropSet, "LabelSeparator")) + { + mAny >>= aSep; + pFS->singleElement( FSNS( XML_c, XML_separator), XML_val, USS(aSep), FSEND); + } pFS->endElement( FSNS( XML_c, XML_dLbl )); } } |