diff options
Diffstat (limited to 'xfa/fxfa/cxfa_pdffontmgr.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_pdffontmgr.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/xfa/fxfa/cxfa_pdffontmgr.cpp b/xfa/fxfa/cxfa_pdffontmgr.cpp index af94ee8c82..5872078fdf 100644 --- a/xfa/fxfa/cxfa_pdffontmgr.cpp +++ b/xfa/fxfa/cxfa_pdffontmgr.cpp @@ -121,30 +121,29 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, CFX_ByteString bsDRName = bsDRFontName; bsDRName.Remove('-'); FX_STRSIZE iPsLen = bsPsName.GetLength(); - FX_STRSIZE nIndex = bsDRName.Find(bsPsName); - if (nIndex != FX_STRNPOS && !bStrictMatch) + auto nIndex = bsDRName.Find(bsPsName); + if (nIndex.has_value() && !bStrictMatch) return true; - if (nIndex != 0) + if (!nIndex.has_value() || nIndex.value() != 0) return false; int32_t iDifferLength = bsDRName.GetLength() - iPsLen; if (iDifferLength > 1 || (bBold || bItalic)) { - FX_STRSIZE iBoldIndex = bsDRName.Find("Bold"); - bool bBoldFont = iBoldIndex != FX_STRNPOS; - if (bBold != bBoldFont) + auto iBoldIndex = bsDRName.Find("Bold"); + if (bBold != iBoldIndex.has_value()) return false; - if (bBoldFont) { - iDifferLength = - std::min(iDifferLength - 4, bsDRName.GetLength() - iBoldIndex - 4); + if (iBoldIndex.has_value()) { + iDifferLength = std::min(iDifferLength - 4, + bsDRName.GetLength() - iBoldIndex.value() - 4); } bool bItalicFont = true; - if (bsDRName.Find("Italic") != FX_STRNPOS) { + if (bsDRName.Contains("Italic")) { iDifferLength -= 6; - } else if (bsDRName.Find("It") != FX_STRNPOS) { + } else if (bsDRName.Contains("It")) { iDifferLength -= 2; - } else if (bsDRName.Find("Oblique") != FX_STRNPOS) { + } else if (bsDRName.Contains("Oblique")) { iDifferLength -= 7; } else { bItalicFont = false; @@ -158,7 +157,7 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, bsDRTailer == "Regular" || bsDRTailer == "Reg") { return true; } - if (bBoldFont || bItalicFont) + if (iBoldIndex.has_value() || bItalicFont) return false; bool bMatch = false; |