diff options
Diffstat (limited to 'xfa/fgas/layout/cfx_rtfbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index 9497e5fde6..1e7587a16e 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -122,7 +122,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)) + if (!m_pFont->GetCharWidth(pCurChar->char_code(), &iCharWidth)) iCharWidth = 0; iCharWidth *= m_iFontSize; @@ -191,8 +191,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) && - !m_pFont->GetCharWidth(pLastChar->char_code(), iCharWidth)) { + if (!m_pFont->GetCharWidth(wForm, &iCharWidth) && + !m_pFont->GetCharWidth(pLastChar->char_code(), &iCharWidth)) { iCharWidth = m_iDefChar; } @@ -206,8 +206,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) && - !m_pFont->GetCharWidth(pCurChar->char_code(), iCharWidth)) { + if (!m_pFont->GetCharWidth(wForm, &iCharWidth) && + !m_pFont->GetCharWidth(pCurChar->char_code(), &iCharWidth)) { iCharWidth = m_iDefChar; } @@ -226,7 +226,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)) + if (!m_pFont->GetCharWidth(wForm, &iCharWidth)) iCharWidth = m_iDefChar; iCharWidth *= m_iFontSize; |