summaryrefslogtreecommitdiff
path: root/vcl/source/font
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-05-08 09:21:17 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-09 09:41:34 +0000
commit50ac0f503b763d08aef4a193c38e64b70220bfba (patch)
tree9e02808b2736ac75852060bb3367c8236b9ac334 /vcl/source/font
parent26d314d2e25945941d49a4872d7ffa27cfc2fdc8 (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 'vcl/source/font')
-rw-r--r--vcl/source/font/font.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 5e672b111748..de56c8059e57 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -424,7 +424,7 @@ SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont )
rOStm.WriteUChar( rImplFont.meRelief );
rOStm.WriteUInt16( rImplFont.maCJKLanguageTag.getLanguageType( false) );
rOStm.WriteBool( rImplFont.mbVertical );
- rOStm.WriteUInt16( rImplFont.meEmphasisMark );
+ rOStm.WriteUInt16( (sal_uInt16)rImplFont.meEmphasisMark );
// new in version 3
rOStm.WriteUInt16( rImplFont.meOverline );
@@ -728,7 +728,7 @@ ImplFont::ImplFont() :
meOverline( LINESTYLE_NONE ),
meStrikeout( STRIKEOUT_NONE ),
meRelief( RELIEF_NONE ),
- meEmphasisMark( EMPHASISMARK_NONE ),
+ meEmphasisMark( FontEmphasisMark::NONE ),
meKerning( FontKerning::NONE ),
meCharSet( RTL_TEXTENCODING_DONTKNOW ),
maLanguageTag( LANGUAGE_DONTKNOW ),