diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 15:58:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-15 08:33:37 +0200 |
| commit | 2a89b42e7daa69e44c96647297e0861987c84a49 (patch) | |
| tree | 6048b2d3786bb35c40aca69578344bc11a342e0d /slideshow/source/engine/attributemap.cxx | |
| parent | 0102b85e4e2506299e034e623b75f9400450eb90 (diff) | |
convert AttributeType to scoped enum
and drop unused CHAR_ROTATION enumerator
Change-Id: I9ca50aef41fa736c7f34c210844fb54f60f5bca8
Diffstat (limited to 'slideshow/source/engine/attributemap.cxx')
| -rw-r--r-- | slideshow/source/engine/attributemap.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index 200bcdc5e8cf..02570946d055 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -41,44 +41,44 @@ namespace slideshow */ static const AnimateAttributeMap::MapEntry lcl_attributeMap[] = { - { "charcolor", ATTRIBUTE_CHAR_COLOR }, - { "charfontname", ATTRIBUTE_CHAR_FONT_NAME }, - { "charheight", ATTRIBUTE_CHAR_HEIGHT }, - { "charposture", ATTRIBUTE_CHAR_POSTURE }, + { "charcolor", AttributeType::CharColor }, + { "charfontname", AttributeType::CharFontName }, + { "charheight", AttributeType::CharHeight }, + { "charposture", AttributeType::CharPosture }, // TODO(Q1): This should prolly be changed in PPT import - // { "charrotation", ATTRIBUTE_CHAR_ROTATION }, - { "charrotation", ATTRIBUTE_ROTATE }, - { "charunderline", ATTRIBUTE_CHAR_UNDERLINE }, - { "charweight", ATTRIBUTE_CHAR_WEIGHT }, - { "color", ATTRIBUTE_COLOR }, - { "dimcolor", ATTRIBUTE_DIMCOLOR }, - { "fillcolor", ATTRIBUTE_FILL_COLOR }, - { "fillstyle", ATTRIBUTE_FILL_STYLE }, - { "height", ATTRIBUTE_HEIGHT }, - { "linecolor", ATTRIBUTE_LINE_COLOR }, - { "linestyle", ATTRIBUTE_LINE_STYLE }, - { "opacity", ATTRIBUTE_OPACITY }, - { "rotate", ATTRIBUTE_ROTATE }, - { "skewx", ATTRIBUTE_SKEW_X }, - { "skewy", ATTRIBUTE_SKEW_Y }, - { "visibility", ATTRIBUTE_VISIBILITY }, - { "width", ATTRIBUTE_WIDTH }, - { "x", ATTRIBUTE_POS_X }, - { "y", ATTRIBUTE_POS_Y } + // { "charrotation", AttributeType::CharRotation }, + { "charrotation", AttributeType::Rotate }, + { "charunderline", AttributeType::CharUnderline }, + { "charweight", AttributeType::CharWeight }, + { "color", AttributeType::Color }, + { "dimcolor", AttributeType::DimColor }, + { "fillcolor", AttributeType::FillColor }, + { "fillstyle", AttributeType::FillStyle }, + { "height", AttributeType::Height }, + { "linecolor", AttributeType::LineColor }, + { "linestyle", AttributeType::LineStyle }, + { "opacity", AttributeType::Opacity }, + { "rotate", AttributeType::Rotate }, + { "skewx", AttributeType::SkewX }, + { "skewy", AttributeType::SkewY }, + { "visibility", AttributeType::Visibility }, + { "width", AttributeType::Width }, + { "x", AttributeType::PosX }, + { "y", AttributeType::PosY } }; static const AnimateAttributeMap aMap( lcl_attributeMap, SAL_N_ELEMENTS(lcl_attributeMap), false ); - AttributeType eAttributeType = ATTRIBUTE_INVALID; + AttributeType eAttributeType = AttributeType::Invalid; // determine the type from the attribute name if( !aMap.lookup( rAttrName, eAttributeType ) ) { SAL_WARN("slideshow", "mapAttributeName(): attribute name not found in map: " << rAttrName); - return ATTRIBUTE_INVALID; + return AttributeType::Invalid; } return eAttributeType; |