From dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 28 Sep 2017 11:51:24 -0400 Subject: Cleanup font defines This CL removes duplicate defines between XFA and core. Several OR'd values have been coverted into individual booleans to make the code clearer. Change-Id: Ic32a71c711cffd9a0cf1136e5a22f0502e085c39 Reviewed-on: https://pdfium-review.googlesource.com/15071 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_widgetacc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/cxfa_widgetacc.cpp') diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 260581e73b..82eec9e16d 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -1497,9 +1497,9 @@ RetainPtr CXFA_WidgetAcc::GetFDEFont() { uint32_t dwFontStyle = 0; if (CXFA_Font font = GetFont(false)) { if (font.IsBold()) - dwFontStyle |= FX_FONTSTYLE_Bold; + dwFontStyle |= FXFONT_BOLD; if (font.IsItalic()) - dwFontStyle |= FX_FONTSTYLE_Italic; + dwFontStyle |= FXFONT_ITALIC; font.GetTypeface(wsFontName); } -- cgit v1.2.3