diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/fgas/layout/fgas_textbreak.cpp | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz | |
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'xfa/fgas/layout/fgas_textbreak.cpp')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 0cc41980cb..f182a6d413 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -732,10 +732,10 @@ static const FX_TxtBreak_LPFAppendChar g_FX_TxtBreak_lpfAppendChar[16] = { &CFX_TxtBreak::AppendChar_Others, &CFX_TxtBreak::AppendChar_Others, }; FX_DWORD CFX_TxtBreak::AppendChar(FX_WCHAR wch) { - FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch]; + FX_DWORD dwProps = kTextLayoutCodeProperties[(uint16_t)wch]; FX_DWORD dwType = (dwProps & FX_CHARTYPEBITSMASK); CFX_TxtChar* pCurChar = m_pCurLine->m_pLineChars->AddSpace(); - pCurChar->m_wCharCode = (FX_WORD)wch; + pCurChar->m_wCharCode = (uint16_t)wch; pCurChar->m_nRotation = m_iCharRotation; pCurChar->m_dwCharProps = dwProps; pCurChar->m_dwCharStyles = 0; @@ -1324,8 +1324,8 @@ void CFX_TxtBreak::Reset() { } struct FX_FORMCHAR { - FX_WORD wch; - FX_WORD wForm; + uint16_t wch; + uint16_t wForm; int32_t iWidth; }; |