diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 16:43:37 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 14:14:51 +0000 |
| commit | 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch) | |
| tree | f0b0607f6b757eb22237527215094bd87b5d03ba /xfa/fxfa/app/xfa_fontmgr.cpp | |
| parent | 893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff) | |
| download | pdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz | |
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/xfa_fontmgr.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_fontmgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp index 5db389663a..d7e34fb944 100644 --- a/xfa/fxfa/app/xfa_fontmgr.cpp +++ b/xfa/fxfa/app/xfa_fontmgr.cpp @@ -1762,10 +1762,10 @@ CFX_RetainPtr<CFGAS_GEFont> CXFA_DefFontMgr::GetFont( if (dwFontStyles & FX_FONTSTYLE_Italic) { dwStyle |= FX_FONTSTYLE_Italic; } - const FX_WCHAR* pReplace = pCurFont->pReplaceFont; + const wchar_t* pReplace = pCurFont->pReplaceFont; int32_t iLength = FXSYS_wcslen(pReplace); while (iLength > 0) { - const FX_WCHAR* pNameText = pReplace; + const wchar_t* pNameText = pReplace; while (*pNameText != L',' && iLength > 0) { pNameText++; iLength--; @@ -1796,7 +1796,7 @@ CFX_RetainPtr<CFGAS_GEFont> CXFA_DefFontMgr::GetDefaultFont( CFX_RetainPtr<CFGAS_GEFont> pFont = pFDEFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage); if (!pFont) { - pFont = pFDEFontMgr->LoadFont(static_cast<const FX_WCHAR*>(nullptr), + pFont = pFDEFontMgr->LoadFont(static_cast<const wchar_t*>(nullptr), dwFontStyles, wCodePage); } if (pFont) @@ -1969,7 +1969,7 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, } bool CXFA_PDFFontMgr::GetCharWidth(const CFX_RetainPtr<CFGAS_GEFont>& pFont, - FX_WCHAR wUnicode, + wchar_t wUnicode, bool bCharCode, int32_t* pWidth) { if (wUnicode != 0x20 || bCharCode) |