diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-02 15:43:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-02 15:43:19 -0700 |
| commit | d19e912dd469e4bdad9f3020e1f6eb98f10f3470 (patch) | |
| tree | 239cb568a80445f14a1ab9b63dcaaddcce67e1cc /xfa/fde/tto/fde_textout.h | |
| parent | 12f3e4a58f05850b93af35619cb04f0231d86acc (diff) | |
| download | pdfium-d19e912dd469e4bdad9f3020e1f6eb98f10f3470.tar.xz | |
Remove FX_BOOL from xfa.
Review-Url: https://codereview.chromium.org/2467203003
Diffstat (limited to 'xfa/fde/tto/fde_textout.h')
| -rw-r--r-- | xfa/fde/tto/fde_textout.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 341547185c..3aba000db1 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -65,9 +65,9 @@ class CFDE_TTOLine : public CFX_Target { int32_t GetSize() const; FDE_TTOPIECE* GetPtrAt(int32_t index); void RemoveLast(int32_t iCount); - void RemoveAll(FX_BOOL bLeaveMemory); + void RemoveAll(bool bLeaveMemory); - FX_BOOL m_bNewReload; + bool m_bNewReload; CFDE_TTOPieceArray m_pieces; protected: @@ -122,10 +122,10 @@ class CFDE_TextOut : public CFX_Target { protected: void CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF& rect); - FX_BOOL RetrieveLineWidth(uint32_t dwBreakStatus, - FX_FLOAT& fStartPos, - FX_FLOAT& fWidth, - FX_FLOAT& fHeight); + bool RetrieveLineWidth(uint32_t dwBreakStatus, + FX_FLOAT& fStartPos, + FX_FLOAT& fWidth, + FX_FLOAT& fHeight); void SetLineWidth(CFX_RectF& rect); void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, @@ -138,14 +138,12 @@ class CFDE_TextOut : public CFX_Target { void Reload(const CFX_RectF& rect); void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect); - FX_BOOL RetriecePieces(uint32_t dwBreakStatus, - int32_t& iStartChar, - int32_t& iPieceWidths, - FX_BOOL bReload, - const CFX_RectF& rect); - void AppendPiece(const FDE_TTOPIECE& ttoPiece, - FX_BOOL bNeedReload, - FX_BOOL bEnd); + bool RetriecePieces(uint32_t dwBreakStatus, + int32_t& iStartChar, + int32_t& iPieceWidths, + bool bReload, + const CFX_RectF& rect); + void AppendPiece(const FDE_TTOPIECE& ttoPiece, bool bNeedReload, bool bEnd); void ReplaceWidthEllipsis(); void DoAlignment(const CFX_RectF& rect); void OnDraw(const CFX_RectF& rtClip); @@ -170,7 +168,7 @@ class CFDE_TextOut : public CFX_Target { uint32_t m_dwStyles; uint32_t m_dwTxtBkStyles; CFX_WideString m_wsEllipsis; - FX_BOOL m_bElliChanged; + bool m_bElliChanged; int32_t m_iEllipsisWidth; CFX_WideString m_wsText; CFX_RectF m_rtClip; |