diff options
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/inc/outdevstate.hxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx index 2613440b0951..9478e4360138 100644 --- a/cppcanvas/source/inc/outdevstate.hxx +++ b/cppcanvas/source/inc/outdevstate.hxx @@ -57,7 +57,7 @@ namespace cppcanvas mapModeTransform(), fontRotation(0.0), - textEmphasisMarkStyle(EMPHASISMARK_NONE), + textEmphasisMarkStyle(FontEmphasisMark::NONE), pushFlags(PushFlags::ALL), textDirection(css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT), textAlignment(0), // TODO(Q2): Synchronize with implrenderer @@ -99,7 +99,7 @@ namespace cppcanvas ::basegfx::B2DHomMatrix mapModeTransform; double fontRotation; - sal_uInt16 textEmphasisMarkStyle; + FontEmphasisMark textEmphasisMarkStyle; PushFlags pushFlags; sal_Int8 textDirection; sal_Int8 textAlignment; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 3368e74c2aab..bb64de5c1e27 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1497,7 +1497,7 @@ namespace cppcanvas (*rParms.maFontUnderline ? (sal_Int8)LINESTYLE_SINGLE : (sal_Int8)LINESTYLE_NONE) : (sal_Int8)rFont.GetUnderline(); rState.textStrikeoutStyle = (sal_Int8)rFont.GetStrikeout(); - rState.textEmphasisMarkStyle = (sal_Int8)rFont.GetEmphasisMark(); + rState.textEmphasisMarkStyle = rFont.GetEmphasisMark() & FontEmphasisMark::Style; rState.isTextEffectShadowSet = rFont.IsShadow(); rState.isTextWordUnderlineSet = rFont.IsWordLineMode(); rState.isTextOutlineModeSet = rFont.IsOutline(); |