Remove CFX_SubstFont::m_bFlagItalic.
It is never changed from false.
-- Initialize in header.
-- Provide out-of-line dtor in .cpp file.
Change-Id: I4250e262e251498d7e24b978d2f3a9535d326263
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59091
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/cfx_substfont.cpp b/core/fxge/cfx_substfont.cpp
index 6c5459e..b9936df 100644
--- a/core/fxge/cfx_substfont.cpp
+++ b/core/fxge/cfx_substfont.cpp
@@ -6,18 +6,6 @@
#include "core/fxge/cfx_substfont.h"
-#include "core/fxcrt/fx_codepage.h"
-#include "core/fxge/fx_font.h"
+CFX_SubstFont::CFX_SubstFont() = default;
-CFX_SubstFont::CFX_SubstFont()
- : m_Charset(FX_CHARSET_ANSI),
- m_Weight(0),
- m_ItalicAngle(0),
- m_WeightCJK(0),
- m_bSubstCJK(false),
- m_bItalicCJK(false),
-#ifdef PDF_ENABLE_XFA
- m_bFlagItalic(false),
-#endif // PDF_ENABLE_XFA
- m_bFlagMM(false) {
-}
+CFX_SubstFont::~CFX_SubstFont() = default;
diff --git a/core/fxge/cfx_substfont.h b/core/fxge/cfx_substfont.h
index e6d93a8..c9ffa40 100644
--- a/core/fxge/cfx_substfont.h
+++ b/core/fxge/cfx_substfont.h
@@ -7,24 +7,22 @@
#ifndef CORE_FXGE_CFX_SUBSTFONT_H_
#define CORE_FXGE_CFX_SUBSTFONT_H_
+#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_string.h"
class CFX_SubstFont {
public:
CFX_SubstFont();
+ ~CFX_SubstFont();
ByteString m_Family;
- int m_Charset;
- int m_Weight;
- int m_ItalicAngle;
- int m_WeightCJK;
- bool m_bSubstCJK;
- bool m_bItalicCJK;
-
-#ifdef PDF_ENABLE_XFA
- bool m_bFlagItalic;
-#endif // PDF_ENABLE_XFA
- bool m_bFlagMM;
+ int m_Charset = FX_CHARSET_ANSI;
+ int m_Weight = 0;
+ int m_ItalicAngle = 0;
+ int m_WeightCJK = 0;
+ bool m_bSubstCJK = false;
+ bool m_bItalicCJK = false;
+ bool m_bFlagMM = false;
};
#endif // CORE_FXGE_CFX_SUBSTFONT_H_
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index 6ef72b9..246fee1 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -138,8 +138,6 @@
if (pSubstFont) {
if (pSubstFont->m_Weight == FXFONT_FW_BOLD)
dwStyles |= FXFONT_BOLD;
- if (pSubstFont->m_bFlagItalic)
- dwStyles |= FXFONT_ITALIC;
} else {
if (m_pFont->IsBold())
dwStyles |= FXFONT_BOLD;