summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/cxfa_textparser.cpp8
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp4
2 files changed, 6 insertions, 6 deletions
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<CFGAS_GEFont> 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<CFGAS_GEFont> 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();
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<CFGAS_GEFont> 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);
}