Index: xfa/fgas/layout/fgas_rtfbreak.h |
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h |
index 3b8551b72c08e90afeef0b53c1e75d0faeaf02d6..d75bbc1d311059c50c68ff3e18e5b5562477c123 100644 |
--- a/xfa/fgas/layout/fgas_rtfbreak.h |
+++ b/xfa/fgas/layout/fgas_rtfbreak.h |
@@ -188,7 +188,7 @@ class CFX_RTFLine { |
return m_LinePieces.GetPtrAt(index); |
} |
int32_t GetLineEnd() const { return m_iStart + m_iWidth; } |
- void RemoveAll(FX_BOOL bLeaveMemory = FALSE) { |
+ void RemoveAll(bool bLeaveMemory = false) { |
CFX_RTFChar* pChar; |
int32_t iCount = m_LineChars.GetSize(); |
for (int32_t i = 0; i < iCount; i++) { |
@@ -233,8 +233,8 @@ class CFX_RTFBreak { |
void SetVerticalScale(int32_t iScale); |
void SetCharRotation(int32_t iCharRotation); |
void SetCharSpace(FX_FLOAT fCharSpace); |
- void SetWordSpace(FX_BOOL bDefault, FX_FLOAT fWordSpace); |
- void SetReadingOrder(FX_BOOL bRTL = FALSE); |
+ void SetWordSpace(bool bDefault, FX_FLOAT fWordSpace); |
+ void SetReadingOrder(bool bRTL = false); |
void SetAlignment(int32_t iAlignment = FX_RTFLINEALIGNMENT_Left); |
void SetUserData(IFX_Retainable* pUserData); |
uint32_t AppendChar(FX_WCHAR wch); |
@@ -246,12 +246,12 @@ class CFX_RTFBreak { |
void Reset(); |
int32_t GetDisplayPos(const FX_RTFTEXTOBJ* pText, |
FXTEXT_CHARPOS* pCharPos, |
- FX_BOOL bCharCode = FALSE, |
+ bool bCharCode = false, |
CFX_WideString* pWSForms = nullptr, |
FX_AdjustCharDisplayPos pAdjustPos = nullptr) const; |
int32_t GetCharRects(const FX_RTFTEXTOBJ* pText, |
CFX_RectFArray& rtArray, |
- FX_BOOL bCharBBox = FALSE) const; |
+ bool bCharBBox = false) const; |
uint32_t AppendChar_CharCode(FX_WCHAR wch); |
uint32_t AppendChar_Combination(CFX_RTFChar* pCurChar, int32_t iRotation); |
uint32_t AppendChar_Tab(CFX_RTFChar* pCurChar, int32_t iRotation); |
@@ -263,25 +263,25 @@ class CFX_RTFBreak { |
int32_t GetLineRotation(uint32_t dwStyles) const; |
void SetBreakStatus(); |
CFX_RTFChar* GetLastChar(int32_t index) const; |
- CFX_RTFLine* GetRTFLine(FX_BOOL bReady) const; |
- CFX_RTFPieceArray* GetRTFPieces(FX_BOOL bReady) const; |
+ CFX_RTFLine* GetRTFLine(bool bReady) const; |
+ CFX_RTFPieceArray* GetRTFPieces(bool bReady) const; |
FX_CHARTYPE GetUnifiedCharType(FX_CHARTYPE chartype) const; |
int32_t GetLastPositionedTab() const; |
- FX_BOOL GetPositionedTab(int32_t& iTabPos) const; |
+ bool GetPositionedTab(int32_t& iTabPos) const; |
int32_t GetBreakPos(CFX_RTFCharArray& tca, |
int32_t& iEndPos, |
- FX_BOOL bAllChars = FALSE, |
- FX_BOOL bOnlyBrk = FALSE); |
+ bool bAllChars = false, |
+ bool bOnlyBrk = false); |
void SplitTextLine(CFX_RTFLine* pCurLine, |
CFX_RTFLine* pNextLine, |
- FX_BOOL bAllChars = FALSE); |
- FX_BOOL EndBreak_SplitLine(CFX_RTFLine* pNextLine, |
- FX_BOOL bAllChars, |
- uint32_t dwStatus); |
+ bool bAllChars = false); |
+ bool EndBreak_SplitLine(CFX_RTFLine* pNextLine, |
+ bool bAllChars, |
+ uint32_t dwStatus); |
void EndBreak_BidiLine(CFX_TPOArray& tpos, uint32_t dwStatus); |
void EndBreak_Alignment(CFX_TPOArray& tpos, |
- FX_BOOL bAllChars, |
+ bool bAllChars, |
uint32_t dwStatus); |
uint32_t m_dwPolicies; |
@@ -297,7 +297,7 @@ class CFX_RTFBreak { |
int32_t m_iFontSize; |
int32_t m_iTabWidth; |
CFX_Int32Array m_PositionedTabs; |
- FX_BOOL m_bOrphanLine; |
+ bool m_bOrphanLine; |
FX_WCHAR m_wDefChar; |
int32_t m_iDefChar; |
FX_WCHAR m_wLineBreakChar; |
@@ -307,9 +307,9 @@ class CFX_RTFBreak { |
int32_t m_iCharRotation; |
int32_t m_iRotation; |
int32_t m_iCharSpace; |
- FX_BOOL m_bWordSpace; |
+ bool m_bWordSpace; |
int32_t m_iWordSpace; |
- FX_BOOL m_bRTL; |
+ bool m_bRTL; |
int32_t m_iAlignment; |
IFX_Retainable* m_pUserData; |
FX_CHARTYPE m_eCharType; |