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_textparser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_textparser.cpp') diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp index 35e9b01580..af9a274a94 100644 --- a/xfa/fxfa/cxfa_textparser.cpp +++ b/xfa/fxfa/cxfa_textparser.cpp @@ -324,9 +324,9 @@ RetainPtr CXFA_TextParser::GetFont( if (font) { font.GetTypeface(wsFamily); if (font.IsBold()) - dwStyle |= FX_FONTSTYLE_Bold; + dwStyle |= FXFONT_BOLD; if (font.IsItalic()) - dwStyle |= FX_FONTSTYLE_Italic; + dwStyle |= FXFONT_BOLD; } if (pStyle) { @@ -336,9 +336,9 @@ RetainPtr CXFA_TextParser::GetFont( dwStyle = 0; if (pStyle->GetFontWeight() > FXFONT_FW_NORMAL) - dwStyle |= FX_FONTSTYLE_Bold; + dwStyle |= FXFONT_BOLD; if (pStyle->GetFontStyle() == CFX_CSSFontStyle::Italic) - dwStyle |= FX_FONTSTYLE_Italic; + dwStyle |= FXFONT_ITALIC; } CXFA_FFDoc* pDoc = pTextProvider->GetDocNode(); -- cgit v1.2.3