From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- core/src/fpdftext/txtproc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/src/fpdftext/txtproc.h') diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index 275aabd53b..efe9ff9082 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -33,8 +33,8 @@ public: ~CTextBaseLine(); void InsertTextBox(FX_FLOAT leftx, FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, const CFX_WideString& str); - FX_BOOL GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); - FX_BOOL CanMerge(CTextBaseLine* pOther); + bool GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); + bool CanMerge(CTextBaseLine* pOther); void Merge(CTextBaseLine* pOther); void MergeBoxes(); void CountChars(int& count, FX_FLOAT& width, int& minchars); @@ -57,9 +57,9 @@ public: FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, CFX_ByteString& str, CPDF_Font* pFont); void WriteOutput(CFX_WideStringArray& lines, int iMinWidth); - FX_BOOL m_bAutoWidth; - FX_BOOL m_bKeepColumn; - FX_BOOL m_bBreakSpace; + bool m_bAutoWidth; + bool m_bKeepColumn; + bool m_bBreakSpace; private: CFX_PtrArray m_BaseLines; -- cgit v1.2.3