From c36fe07a4d800cab2bfbec95e8580ea2b0e406d2 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 9 Mar 2017 16:58:12 -0500 Subject: Cleanup FX_TXTBREAK This Cl removes the FX_TXTBREAK defines and unifies the type with the CFX_RTFBreakType which is renamed to CFX_BreakType. Change-Id: I890ae5e08a65f922d714aaaa9ab0f9f8a882cb3c Reviewed-on: https://pdfium-review.googlesource.com/2939 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fde/tto/fde_textout.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fde/tto/fde_textout.h') diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 04d656776e..fd9f6027f4 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -11,6 +11,7 @@ #include #include +#include "core/fxcrt/fx_ucd.h" #include "core/fxge/cfx_fxgedevice.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" @@ -120,7 +121,7 @@ class CFDE_TextOut { protected: void CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF& rect); - bool RetrieveLineWidth(uint32_t dwBreakStatus, + bool RetrieveLineWidth(CFX_BreakType dwBreakStatus, FX_FLOAT& fStartPos, FX_FLOAT& fWidth, FX_FLOAT& fHeight); @@ -136,7 +137,7 @@ class CFDE_TextOut { void Reload(const CFX_RectF& rect); void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect); - bool RetriecePieces(uint32_t dwBreakStatus, + bool RetrievePieces(CFX_BreakType dwBreakStatus, int32_t& iStartChar, int32_t& iPieceWidths, bool bReload, -- cgit v1.2.3