| Index: xfa/src/fgas/src/layout/fx_linebreak.cpp
|
| diff --git a/xfa/src/fgas/src/layout/fx_linebreak.cpp b/xfa/src/fgas/src/layout/fx_linebreak.cpp
|
| index 3eef550a020af012e39424a15b9173160bfa9034..76fc2221954209d684c876c6dae40260039b0dd2 100644
|
| --- a/xfa/src/fgas/src/layout/fx_linebreak.cpp
|
| +++ b/xfa/src/fgas/src/layout/fx_linebreak.cpp
|
| @@ -5,7 +5,7 @@
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| #include "../fgas_base.h"
|
| -extern const FX_DWORD gs_FX_TextLayout_CodeProperties[65536];
|
| +
|
| extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = {
|
| {FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB,
|
| FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB,
|
| @@ -273,11 +273,11 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
|
| FX_DWORD dwCur, dwNext;
|
| FX_WCHAR wch;
|
| wch = *pwsText++;
|
| - dwCur = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & 0x003F;
|
| + dwCur = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
|
| iLength--;
|
| for (int32_t i = 0; i < iLength; i++) {
|
| wch = *pwsText++;
|
| - dwNext = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & 0x003F;
|
| + dwNext = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
|
| if (dwNext == FX_CBP_SP) {
|
| pBrkType[i] = FX_LBT_PROHIBITED_BRK;
|
| } else {
|
| @@ -298,11 +298,11 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
|
| FX_DWORD dwCur, dwNext;
|
| FX_WCHAR wch;
|
| wch = *pwsText++;
|
| - dwCur = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & 0x003F;
|
| + dwCur = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
|
| iLength--;
|
| for (int32_t i = 0; i < iLength; i++) {
|
| wch = *pwsText++;
|
| - dwNext = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & 0x003F;
|
| + dwNext = kTextLayoutCodeProperties[(FX_WORD)wch] & 0x003F;
|
| if (dwNext == FX_CBP_SP) {
|
| eType = FX_LBT_PROHIBITED_BRK;
|
| } else {
|
|
|