diff options
Diffstat (limited to 'xfa/fgas')
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.cpp | 9 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.h | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index 9e4e445e0a..b2c54e5c6d 100644 --- a/xfa/fgas/layout/cfx_txtbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -634,9 +634,7 @@ struct FX_FORMCHAR { }; int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun, - FXTEXT_CHARPOS* pCharPos, - bool bCharCode, - CFX_WideString* pWSForms) const { + FXTEXT_CHARPOS* pCharPos) const { if (!pTxtRun || pTxtRun->iLength < 1) return 0; @@ -822,14 +820,11 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun, wLast = (wchar_t)formChars[j - 1].wForm; } if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) { - pCharPos->m_GlyphIndex = - bCharCode ? wch : pFont->GetGlyphIndex(wForm, false); + pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm, false); #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ pCharPos->m_ExtGID = pCharPos->m_GlyphIndex; #endif pCharPos->m_FontCharWidth = iCharWidth; - if (pWSForms) - *pWSForms += wForm; } int32_t iCharHeight = 1000; diff --git a/xfa/fgas/layout/cfx_txtbreak.h b/xfa/fgas/layout/cfx_txtbreak.h index 0529c2656c..d74ea350fe 100644 --- a/xfa/fgas/layout/cfx_txtbreak.h +++ b/xfa/fgas/layout/cfx_txtbreak.h @@ -66,9 +66,7 @@ class CFX_TxtBreak : public CFX_Break { CFX_BreakType EndBreak(CFX_BreakType dwStatus); int32_t GetDisplayPos(const FX_TXTRUN* pTxtRun, - FXTEXT_CHARPOS* pCharPos, - bool bCharCode = false, - CFX_WideString* pWSForms = nullptr) const; + FXTEXT_CHARPOS* pCharPos) const; std::vector<CFX_RectF> GetCharRects(const FX_TXTRUN* pTxtRun, bool bCharBBox = false) const; CFX_BreakType AppendChar(wchar_t wch); |