diff --git a/HwpFile/HwpDoc/Conversion/StyleConverter.cpp b/HwpFile/HwpDoc/Conversion/StyleConverter.cpp index d84ef39330..320816826c 100644 --- a/HwpFile/HwpDoc/Conversion/StyleConverter.cpp +++ b/HwpFile/HwpDoc/Conversion/StyleConverter.cpp @@ -243,7 +243,7 @@ CRunnerStyle CStyleConverter::GenerateRunnerStyle(const CHWPRecordCharShape& oCh if (oCharShape.Italic()) oRunnerStyle.SetItalic(true); - if (oCharShape.StrikeOut()) + if (oCharShape.StrikeOut() && ELineStyle2::NONE != oCharShape.GetStrikeOutType()) oRunnerStyle.SetStrike(EStrikeType::Single); if (oCharShape.SuperScript()) @@ -284,7 +284,7 @@ CRunnerStyle CStyleConverter::GenerateRunnerStyle(const CHWPRecordCharShape& oCh case ELineStyle1::SOLID_3D_REVERS_LI: oRunnerStyle.SetU({EUType::Thick, oCharShape.GetUnderlineColor()}); break; } } - else if (EUnderline::CENTER == eUnderlineType) + else if (EUnderline::CENTER == eUnderlineType && !oCharShape.StrikeOut()) { if (eUnderlineStyle == ELineStyle1::DOUBLE_SLIM || eUnderlineStyle == ELineStyle1::DOUBLE_WAVE) diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp index 3c472815f3..fd470e685a 100644 --- a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp +++ b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp @@ -310,7 +310,7 @@ bool CHWPRecordCharShape::Underline() const bool CHWPRecordCharShape::StrikeOut() const { - return ELineStyle2::NONE != m_eStrikeOutShape; + return 0x01 == m_chStrikeOut; } bool CHWPRecordCharShape::SuperScript() const