From 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 13 Mar 2017 16:43:37 -0400 Subject: Replace FX_CHAR and FX_WCHAR with underlying types. Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8 Reviewed-on: https://pdfium-review.googlesource.com/2967 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fgas/layout/fgas_rtfbreak.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fgas/layout/fgas_rtfbreak.h') diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h index b3def63251..339d2f4bcd 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -36,7 +36,7 @@ struct FX_RTFTEXTOBJ { std::vector pWidths; CFX_RetainPtr pFont; const CFX_RectF* pRect; - FX_WCHAR wLineBreakChar; + wchar_t wLineBreakChar; FX_FLOAT fFontSize; int32_t iLength; int32_t iBidiLevel; @@ -74,7 +74,7 @@ class CFX_RTFBreak { FXTEXT_CHARPOS* pCharPos, bool bCharCode) const; - CFX_BreakType AppendChar(FX_WCHAR wch); + CFX_BreakType AppendChar(wchar_t wch); CFX_BreakLine* GetCurrentLineForTesting() const { return m_pCurLine; } @@ -116,9 +116,9 @@ class CFX_RTFBreak { int32_t m_iFontSize; int32_t m_iTabWidth; std::vector m_PositionedTabs; - FX_WCHAR m_wDefChar; + wchar_t m_wDefChar; int32_t m_iDefChar; - FX_WCHAR m_wLineBreakChar; + wchar_t m_wLineBreakChar; int32_t m_iHorizontalScale; int32_t m_iVerticalScale; int32_t m_iCharSpace; -- cgit v1.2.3