diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-09-01 12:40:05 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-05 14:03:36 +0000 |
| commit | 740bcd892d22136873b2b123b94e51bf6e77b8f9 (patch) | |
| tree | 86bcc39a487163e2bfe6858d84393ef52ad09ef2 /xfa/fgas/layout | |
| parent | 3c5944c93445bb40c2131ea6782e8cc8b673bffb (diff) | |
| download | pdfium-740bcd892d22136873b2b123b94e51bf6e77b8f9.tar.xz | |
Split fx_ucd.h into fx_unicode.h and fx_ucddata.h.
File naming now matches.
Fix one usage not going through the accessor function.
Change-Id: I5cc4986238764964f2a71807a94bd2facf517263
Reviewed-on: https://pdfium-review.googlesource.com/12930
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
| -rw-r--r-- | xfa/fgas/layout/cfx_linebreak.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.h | 2 | ||||
| -rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fgas/layout/cfx_linebreak.cpp b/xfa/fgas/layout/cfx_linebreak.cpp index 9531bc55b0..14352481bd 100644 --- a/xfa/fgas/layout/cfx_linebreak.cpp +++ b/xfa/fgas/layout/cfx_linebreak.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/layout/cfx_linebreak.h" -#include "core/fxcrt/fx_ucd.h" +#include "core/fxcrt/fx_unicode.h" 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, diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h index 5151f4f6db..699815ab98 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.h +++ b/xfa/fgas/layout/cfx_rtfbreak.h @@ -12,7 +12,7 @@ #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" -#include "core/fxcrt/fx_ucd.h" +#include "core/fxcrt/fx_unicode.h" #include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/layout/cfx_break.h" #include "xfa/fxfa/cxfa_textuserdata.h" diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index 2ea64d2bd5..c30b4a1704 100644 --- a/xfa/fgas/layout/cfx_txtbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -202,7 +202,7 @@ CFX_BreakType CFX_TxtBreak::AppendChar_Others(CFX_Char* pCurChar) { } CFX_BreakType CFX_TxtBreak::AppendChar(wchar_t wch) { - uint32_t dwProps = kTextLayoutCodeProperties[static_cast<uint16_t>(wch)]; + uint32_t dwProps = FX_GetUnicodeProperties(wch); FX_CHARTYPE chartype = GetCharTypeFromProp(dwProps); m_pCurLine->m_LineChars.emplace_back(wch, dwProps, m_iHorizontalScale, m_iVerticalScale); |