summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/cfx_break.cpp4
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.cpp16
-rw-r--r--xfa/fgas/layout/cfx_txtbreak.cpp22
3 files changed, 21 insertions, 21 deletions
diff --git a/xfa/fgas/layout/cfx_break.cpp b/xfa/fgas/layout/cfx_break.cpp
index 5c5569ad44..6e1103cf65 100644
--- a/xfa/fgas/layout/cfx_break.cpp
+++ b/xfa/fgas/layout/cfx_break.cpp
@@ -112,7 +112,7 @@ void CFX_Break::FontChanged() {
if (!m_pFont || m_wDefChar == 0xFEFF)
return;
- m_pFont->GetCharWidth(m_wDefChar, m_iDefChar, false);
+ m_pFont->GetCharWidth(m_wDefChar, m_iDefChar);
m_iDefChar *= m_iFontSize;
}
@@ -129,7 +129,7 @@ void CFX_Break::SetDefaultChar(wchar_t wch) {
if (m_wDefChar == 0xFEFF || !m_pFont)
return;
- m_pFont->GetCharWidth(m_wDefChar, m_iDefChar, false);
+ m_pFont->GetCharWidth(m_wDefChar, m_iDefChar);
if (m_iDefChar < 0)
m_iDefChar = 0;
else
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;
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index a7683bc978..2d6e606e82 100644
--- a/xfa/fgas/layout/cfx_txtbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -78,7 +78,7 @@ void CFX_TxtBreak::AppendChar_Combination(CFX_Char* pCurChar) {
pCurChar->m_dwCharStyles |= FX_TXTCHARSTYLE_ArabicShadda;
}
}
- if (!m_pFont->GetCharWidth(wForm, iCharWidth, false))
+ if (!m_pFont->GetCharWidth(wForm, iCharWidth))
iCharWidth = 0;
iCharWidth *= m_iFontSize;
@@ -137,7 +137,7 @@ CFX_BreakType CFX_TxtBreak::AppendChar_Arabic(CFX_Char* pCurChar) {
wForm = pdfium::arabic::GetFormChar(pLastChar, pPrevChar, pCurChar);
bAlef = (wForm == 0xFEFF &&
pLastChar->GetCharType() == FX_CHARTYPE_ArabicAlef);
- m_pFont->GetCharWidth(wForm, iCharWidth, false);
+ m_pFont->GetCharWidth(wForm, iCharWidth);
if (wForm == 0xFEFF)
iCharWidth = m_iDefChar;
@@ -156,7 +156,7 @@ CFX_BreakType CFX_TxtBreak::AppendChar_Arabic(CFX_Char* pCurChar) {
if (m_bCombText) {
iCharWidth = m_iCombWidth;
} else {
- m_pFont->GetCharWidth(wForm, iCharWidth, false);
+ m_pFont->GetCharWidth(wForm, iCharWidth);
if (wForm == 0xFEFF)
iCharWidth = m_iDefChar;
@@ -183,7 +183,7 @@ CFX_BreakType CFX_TxtBreak::AppendChar_Others(CFX_Char* pCurChar) {
if (m_bCombText) {
iCharWidth = m_iCombWidth;
} else {
- if (!m_pFont->GetCharWidth(wForm, iCharWidth, false))
+ if (!m_pFont->GetCharWidth(wForm, iCharWidth))
iCharWidth = m_iDefChar;
iCharWidth *= m_iFontSize;
@@ -810,11 +810,11 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if (bLam) {
formChars[1].wForm = 0x0651;
iCharWidth = 0;
- pFont->GetCharWidth(0x0651, iCharWidth, false);
+ pFont->GetCharWidth(0x0651, iCharWidth);
formChars[1].iWidth = iCharWidth;
formChars[2].wForm = 0x0670;
iCharWidth = 0;
- pFont->GetCharWidth(0x0670, iCharWidth, false);
+ pFont->GetCharWidth(0x0670, iCharWidth);
formChars[2].iWidth = iCharWidth;
}
@@ -827,7 +827,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
wLast = (wchar_t)formChars[j - 1].wForm;
}
if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) {
- pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm, false);
+ pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
#endif
@@ -843,14 +843,14 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if ((dwStyles & FX_LAYOUTSTYLE_CombText) != 0) {
int32_t iFormWidth = iCharWidth;
- pFont->GetCharWidth(wForm, iFormWidth, false);
+ pFont->GetCharWidth(wForm, iFormWidth);
float fOffset = fFontSize * (iCharWidth - iFormWidth) / 2000.0f;
pCharPos->m_Origin.x += fOffset;
}
if (chartype == FX_CHARTYPE_Combination) {
CFX_Rect rtBBox;
- if (pFont->GetCharBBox(wForm, &rtBBox, false)) {
+ if (pFont->GetCharBBox(wForm, &rtBBox)) {
pCharPos->m_Origin.y =
fYBase + fFontSize -
fFontSize * (float)rtBBox.height / (float)iMaxHeight;
@@ -860,7 +860,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if ((dwLastProps & FX_CHARTYPEBITSMASK) ==
FX_CHARTYPE_Combination) {
CFX_Rect rtBox;
- if (pFont->GetCharBBox(wLast, &rtBox, false))
+ if (pFont->GetCharBBox(wLast, &rtBox))
pCharPos->m_Origin.y -= fFontSize * rtBox.height / iMaxHeight;
}
}
@@ -957,7 +957,7 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
if (bCharBBox && !bRet) {
int32_t iCharWidth = 1000;
- pFont->GetCharWidth(wch, iCharWidth, false);
+ pFont->GetCharWidth(wch, iCharWidth);
float fRTLeft = 0, fCharWidth = 0;
if (iCharWidth > 0) {
fCharWidth = iCharWidth * fScale;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:30:21 +0000