diff options
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index a6bd3b4c0618..2f4b55fcd2d8 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -3091,7 +3091,7 @@ void ChartExport::exportDataLabels( if (GetProperty(xPropSet, "LinkNumberFormatToSource")) mAny >>= bLinkedNumFmt; - if (GetProperty(xPropSet, "NumberFormat")) + if (GetProperty(xPropSet, "NumberFormat") || GetProperty(xPropSet, "PercentageNumberFormat")) { sal_Int32 nKey = 0; mAny >>= nKey; @@ -3157,15 +3157,31 @@ void ChartExport::exportDataLabels( const sal_Int32* p = aAttrLabelIndices.getConstArray(); const sal_Int32* pEnd = p + aAttrLabelIndices.getLength(); + + for (; p != pEnd; ++p) { sal_Int32 nIdx = *p; uno::Reference<beans::XPropertySet> xLabelPropSet = xSeries->getDataPointByIndex(nIdx); + if (!xLabelPropSet.is()) continue; - // Individual label property that overwrites the baseline. pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND); + + if (GetProperty(xLabelPropSet, "NumberFormat") || GetProperty(xLabelPropSet, "PercentageNumberFormat")) + { + sal_Int32 nKey = 0; + mAny >>= nKey; + + OUString aNumberFormatString = getNumberFormatCode(nKey); + OString sNumberFormatString = OUStringToOString(aNumberFormatString, RTL_TEXTENCODING_UTF8); + + pFS->singleElement(FSNS(XML_c, XML_numFmt), XML_formatCode, sNumberFormatString.getStr(), + XML_sourceLinked, bLinkedNumFmt ? "1" : "0", FSEND); + } + + // Individual label property that overwrites the baseline. pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND); exportTextProps( xPropSet ); writeLabelProperties(pFS, this, xLabelPropSet, aParam); |