diff options
| author | sushil_shinde <sushil.shinde@synerzip.com> | 2014-01-29 14:31:19 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-11 23:23:40 +0000 |
| commit | 83055835b1425b0a9d2fe5dce2f4db2d7a61919d (patch) | |
| tree | 1116f8f96a7411d66792dcc7eeb23c470324f427 /xmloff | |
| parent | 7da3f43e636112b30a15d29de2f419d4b82dcb38 (diff) | |
fdo#74112 Preserve Chart displayunits properties during ODF import/export.
Change-Id: I38508b71ee5b3b966e1d36b0d253304fe17c0ec0
Reviewed-on: https://gerrit.libreoffice.org/7721
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 89f990a71fdb..8bd4b2455495 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -137,6 +137,9 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), + // Chart display units flags + MAP_ENTRY_ODF_EXT( "DisplayUnits", LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), MAP_ENTRY_ODF12( "ExternalData", CHART, XML_EXTERNALDATA, XML_TYPE_STRING), MAP_ENTRY( "ScaleText", CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ), diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 8ff43ec827d4..1e35261a7b33 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3226,6 +3226,8 @@ namespace xmloff { namespace token { TOKEN( "data-table-show-horz-border", XML_CHART_DTABLE_SHOWHORZBORDER ), TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ), TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), + TOKEN( "display-units", XML_CHART_DUNITS_DISPLAYUNITS ), + TOKEN( "display-units-built-in-unit", XML_CHART_DUNITS_BUILTINUNIT ), TOKEN( "external-data", XML_EXTERNALDATA), #if OSL_DEBUG_LEVEL > 0 |