mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert FONT_EMPHASIS_MARK to scoped enum

Browse Source 
Change-Id: I137c78b337e57d3442db08334128e79d186b278f
Reviewed-on: https://gerrit.libreoffice.org/24753
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-05-08 09:21:17 +02:00
parent 26d314d2e2
commit 50ac0f503b
38 changed files with 169 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppcanvas/source/inc/outdevstate.hxx
View File

@@ -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;

2
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -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();