diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-04-22 13:52:17 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-04-22 13:57:32 +0200 |
| commit | c5cca8e48f4af440c4814cbaf672d5b4af167bc8 (patch) | |
| tree | 3376ede4f241bde38a93809843973fe9205561b3 /xmloff | |
| parent | 0adb6c7e1a1bc5b0e9f2df99961bf56cc6ae126d (diff) | |
fix mismerge in PropertyMap.hxx
Change-Id: Ic8a0b81a9a44d8494ef1634e23b25fcb9423e7ff
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 526e2b7bf141..d1ec843778d9 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -189,7 +189,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_SPECIAL_ODF12( "ErrorBarRangeNegative", CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only // errorbars properties (chart2) - MAP_ENTRY_ODF_EXT( "Weigth", CHART, XML_ERROR_STANDARD_WEIGTH, XML_TYPE_DOUBLE), + MAP_ENTRY_ODF_EXT( "Weigth", CHART, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), // series/data-point properties MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), // convert one constant |