diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-09 16:58:12 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-13 13:43:05 +0000 |
| commit | c36fe07a4d800cab2bfbec95e8580ea2b0e406d2 (patch) | |
| tree | 7d3cce091856f50d08aaf646022f464b4ab186a0 /xfa/fgas/layout/fgas_rtfbreak.h | |
| parent | e472622d33bdca2316a22ff5ff8d77ac975c2eb2 (diff) | |
| download | pdfium-c36fe07a4d800cab2bfbec95e8580ea2b0e406d2.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout/fgas_rtfbreak.h')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h index 125b06fe95..5d29e0e84f 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -76,7 +76,7 @@ class CFX_RTFPiece { return ret; } - CFX_RTFBreakType m_dwStatus; + CFX_BreakType m_dwStatus; int32_t m_iStartPos; int32_t m_iWidth; int32_t m_iStartChar; @@ -140,7 +140,7 @@ class CFX_RTFBreak { void AddPositionedTab(FX_FLOAT fTabPos); - CFX_RTFBreakType EndBreak(CFX_RTFBreakType dwStatus); + CFX_BreakType EndBreak(CFX_BreakType dwStatus); int32_t CountBreakPieces() const; const CFX_RTFPiece* GetBreakPieceUnstable(int32_t index) const; void ClearBreakPieces(); @@ -151,16 +151,16 @@ class CFX_RTFBreak { FXTEXT_CHARPOS* pCharPos, bool bCharCode) const; - CFX_RTFBreakType AppendChar(FX_WCHAR wch); + CFX_BreakType AppendChar(FX_WCHAR wch); CFX_RTFLine* GetCurrentLineForTesting() const { return m_pCurLine; } private: void AppendChar_Combination(CFX_RTFChar* pCurChar); void AppendChar_Tab(CFX_RTFChar* pCurChar); - CFX_RTFBreakType AppendChar_Control(CFX_RTFChar* pCurChar); - CFX_RTFBreakType AppendChar_Arabic(CFX_RTFChar* pCurChar); - CFX_RTFBreakType AppendChar_Others(CFX_RTFChar* pCurChar); + CFX_BreakType AppendChar_Control(CFX_RTFChar* pCurChar); + CFX_BreakType AppendChar_Arabic(CFX_RTFChar* pCurChar); + CFX_BreakType AppendChar_Others(CFX_RTFChar* pCurChar); void FontChanged(); void SetBreakStatus(); CFX_RTFChar* GetLastChar(int32_t index) const; @@ -178,11 +178,11 @@ class CFX_RTFBreak { bool bAllChars); bool EndBreak_SplitLine(CFX_RTFLine* pNextLine, bool bAllChars, - CFX_RTFBreakType dwStatus); - void EndBreak_BidiLine(std::deque<FX_TPO>* tpos, CFX_RTFBreakType dwStatus); + CFX_BreakType dwStatus); + void EndBreak_BidiLine(std::deque<FX_TPO>* tpos, CFX_BreakType dwStatus); void EndBreak_Alignment(const std::deque<FX_TPO>& tpos, bool bAllChars, - CFX_RTFBreakType dwStatus); + CFX_BreakType dwStatus); int32_t m_iBoundaryStart; int32_t m_iBoundaryEnd; |