diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-24 20:11:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-25 06:11:27 +0000 |
| commit | a82805f8f97eeb6acadd7806cdb7120bed45a376 (patch) | |
| tree | 213a2cae70d328a9e78bae7081a6dfa4025d95f1 /chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | |
| parent | 2b68383e44338ffc3d5fb519fd91ff31f0a2b35a (diff) | |
Kill comphelper::MakeMap
Change-Id: I97e9e79ef51e3d78f01b831dd3eee91218058823
Reviewed-on: https://gerrit.libreoffice.org/24344
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx')
| -rw-r--r-- | chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index eb49b1020b88..8c99140704b8 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -58,17 +58,14 @@ namespace { ItemPropertyMapType & lcl_GetAxisPropertyMap() { - static ItemPropertyMapType aAxisPropertyMap( - MakeItemPropertyMap - IPM_MAP_ENTRY( SCHATTR_AXIS_SHOWDESCR, "DisplayLabels", 0 ) - IPM_MAP_ENTRY( SCHATTR_AXIS_TICKS, "MajorTickmarks", 0 ) - IPM_MAP_ENTRY( SCHATTR_AXIS_HELPTICKS, "MinorTickmarks", 0 ) - IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_ORDER, "ArrangeOrder", 0 ) - IPM_MAP_ENTRY( SCHATTR_TEXT_STACKED, "StackCharacters", 0 ) - IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_BREAK, "TextBreak", 0 ) - IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_OVERLAP, "TextOverlap", 0 ) - ); - + static ItemPropertyMapType aAxisPropertyMap{ + {SCHATTR_AXIS_SHOWDESCR, {"DisplayLabels", 0}}, + {SCHATTR_AXIS_TICKS, {"MajorTickmarks", 0}}, + {SCHATTR_AXIS_HELPTICKS, {"MinorTickmarks", 0}}, + {SCHATTR_AXIS_LABEL_ORDER, {"ArrangeOrder", 0}}, + {SCHATTR_TEXT_STACKED, {"StackCharacters", 0}}, + {SCHATTR_AXIS_LABEL_BREAK, {"TextBreak", 0}}, + {SCHATTR_AXIS_LABEL_OVERLAP, {"TextOverlap", 0}}}; return aAxisPropertyMap; }; |