diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-08 09:21:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 09:41:34 +0000 |
| commit | 50ac0f503b763d08aef4a193c38e64b70220bfba (patch) | |
| tree | 9e02808b2736ac75852060bb3367c8236b9ac334 /include/drawinglayer | |
| parent | 26d314d2e25945941d49a4872d7ffa27cfc2fdc8 (diff) | |
convert FONT_EMPHASIS_MARK to scoped enum
Change-Id: I137c78b337e57d3442db08334128e79d186b278f
Reviewed-on: https://gerrit.libreoffice.org/24753
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/drawinglayer')
| -rw-r--r-- | include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 2 | ||||
| -rw-r--r-- | include/drawinglayer/primitive2d/textenumsprimitive2d.hxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 671b73246261..23f6b26f33b3 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -99,7 +99,7 @@ namespace drawinglayer bool bUnderlineAbove = false, TextStrikeout eTextStrikeout = TEXT_STRIKEOUT_NONE, bool bWordLineMode = false, - TextEmphasisMark eTextEmphasisMark = TEXT_EMPHASISMARK_NONE, + TextEmphasisMark eTextEmphasisMark = TEXT_FONT_EMPHASIS_MARK_NONE, bool bEmphasisMarkAbove = true, bool bEmphasisMarkBelow = false, TextRelief eTextRelief = TEXT_RELIEF_NONE, diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 9464d80e6563..b84779984e95 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -78,11 +78,11 @@ namespace drawinglayer /** TextEmphasisMark definition */ enum TextEmphasisMark { - TEXT_EMPHASISMARK_NONE, - TEXT_EMPHASISMARK_DOT, - TEXT_EMPHASISMARK_CIRCLE, - TEXT_EMPHASISMARK_DISC, - TEXT_EMPHASISMARK_ACCENT + TEXT_FONT_EMPHASIS_MARK_NONE, + TEXT_FONT_EMPHASIS_MARK_DOT, + TEXT_FONT_EMPHASIS_MARK_CIRCLE, + TEXT_FONT_EMPHASIS_MARK_DISC, + TEXT_FONT_EMPHASIS_MARK_ACCENT }; /** TextRelief definition */ |