diff options
Diffstat (limited to 'xfa/fgas/layout')
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp | 14 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.cpp | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index a097361d95..be5780fc7a 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -565,16 +565,18 @@ int32_t CFX_RTFBreak::GetBreakPos(std::vector<CFX_Char>& tca, uint32_t nCur = nCodeProp & 0x003F; bool bNeedBreak = false; FX_LINEBREAKTYPE eType; - if (nCur == FX_CBP_TB) { + if (nCur == kBreakPropertyTB) { bNeedBreak = true; - eType = nNext == FX_CBP_TB ? FX_LBT_PROHIBITED_BRK - : gs_FX_LineBreak_PairTable[nCur][nNext]; + eType = nNext == kBreakPropertyTB + ? FX_LBT_PROHIBITED_BRK + : gs_FX_LineBreak_PairTable[nCur][nNext]; } else { - if (nCur == FX_CBP_SP) + if (nCur == kBreakPropertySpace) bNeedBreak = true; - eType = nNext == FX_CBP_SP ? FX_LBT_PROHIBITED_BRK - : gs_FX_LineBreak_PairTable[nCur][nNext]; + eType = nNext == kBreakPropertySpace + ? FX_LBT_PROHIBITED_BRK + : gs_FX_LineBreak_PairTable[nCur][nNext]; } if (bAllChars) pCur->m_nBreakType = eType; diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index 3ba7640904..2ea64d2bd5 100644 --- a/xfa/fgas/layout/cfx_txtbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -548,14 +548,15 @@ int32_t CFX_TxtBreak::GetBreakPos(std::vector<CFX_Char>& ca, pCur = &ca[iLength]; nCodeProp = pCur->char_props(); nCur = nCodeProp & 0x003F; - if (nNext == FX_CBP_SP) + if (nNext == kBreakPropertySpace) eType = FX_LBT_PROHIBITED_BRK; else eType = gs_FX_LineBreak_PairTable[nCur][nNext]; if (bAllChars) pCur->m_nBreakType = static_cast<uint8_t>(eType); if (!bOnlyBrk) { - if (m_bSingleLine || iEndPos <= m_iLineWidth || nCur == FX_CBP_SP) { + if (m_bSingleLine || iEndPos <= m_iLineWidth || + nCur == kBreakPropertySpace) { if (eType == FX_LBT_DIRECT_BRK && iBreak < 0) { iBreak = iLength; iBreakPos = iEndPos; |