diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 11:32:17 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 15:45:58 +0000 |
| commit | 1ca7173cd85adcd58766fc89f95c3dc163efa17a (patch) | |
| tree | effbc52dd5ec7327a2c945ad39cfd3c44f07c8c1 /xfa/fgas/layout/cfx_rtfbreak.cpp | |
| parent | 9c392c82abee05ac2fd42e69984e2de8e48b797a (diff) | |
| download | pdfium-1ca7173cd85adcd58766fc89f95c3dc163efa17a.tar.xz | |
Cleanup CFGAS_GEFont methods
Remove unused params, cleanup return values.
Change-Id: I9a1bc400e24cdcac982a578242ff0f9de8055775
Reviewed-on: https://pdfium-review.googlesource.com/15070
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fgas/layout/cfx_rtfbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index cf37030db0..0b556d89eb 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -121,7 +121,7 @@ CFX_BreakType CFX_RTFBreak::AppendChar(wchar_t wch) { void CFX_RTFBreak::AppendChar_Combination(CFX_Char* pCurChar) { int32_t iCharWidth = 0; - if (!m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth, false)) + if (!m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth)) iCharWidth = 0; iCharWidth *= m_iFontSize; @@ -190,8 +190,8 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Arabic(CFX_Char* pCurChar) { wForm = pdfium::arabic::GetFormChar(pLastChar, pPrevChar, pCurChar); bAlef = (wForm == 0xFEFF && pLastChar->GetCharType() == FX_CHARTYPE_ArabicAlef); - if (!m_pFont->GetCharWidth(wForm, iCharWidth, false) && - !m_pFont->GetCharWidth(pLastChar->char_code(), iCharWidth, false)) { + if (!m_pFont->GetCharWidth(wForm, iCharWidth) && + !m_pFont->GetCharWidth(pLastChar->char_code(), iCharWidth)) { iCharWidth = m_iDefChar; } @@ -205,8 +205,8 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Arabic(CFX_Char* pCurChar) { wForm = pdfium::arabic::GetFormChar(pCurChar, bAlef ? nullptr : pLastChar, nullptr); - if (!m_pFont->GetCharWidth(wForm, iCharWidth, false) && - !m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth, false)) { + if (!m_pFont->GetCharWidth(wForm, iCharWidth) && + !m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth)) { iCharWidth = m_iDefChar; } @@ -225,7 +225,7 @@ CFX_BreakType CFX_RTFBreak::AppendChar_Others(CFX_Char* pCurChar) { FX_CHARTYPE chartype = pCurChar->GetCharType(); wchar_t wForm = pCurChar->char_code(); int32_t iCharWidth = 0; - if (!m_pFont->GetCharWidth(wForm, iCharWidth, false)) + if (!m_pFont->GetCharWidth(wForm, iCharWidth)) iCharWidth = m_iDefChar; iCharWidth *= m_iFontSize; @@ -726,9 +726,9 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText, if (bCharCode) { pCharPos->m_GlyphIndex = wch; } else { - pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm, false); + pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm); if (pCharPos->m_GlyphIndex == 0xFFFF) - pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wch, false); + pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wch); } #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ pCharPos->m_ExtGID = pCharPos->m_GlyphIndex; |