diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-21 11:31:25 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-21 15:55:35 +0000 |
| commit | 5c529e6318d46121a5ea38d3edb42c8d9f580fe8 (patch) | |
| tree | f11ae317bb4cdb94e69e9b1ae1a6db6342218b61 /xfa/fde/cfde_txtedtpage.cpp | |
| parent | a766a958c5867a2a5562095ad03f72290db18b98 (diff) | |
| download | pdfium-5c529e6318d46121a5ea38d3edb42c8d9f580fe8.tar.xz | |
Combine more RTF and TXT Break code
This Cl conbines several more methods from RTFBreak and TXTBreak into
the common Break baseclass.
Change-Id: Ibe2236eb4fd30faab239e7c9c8b578164014eb39
Reviewed-on: https://pdfium-review.googlesource.com/3108
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_txtedtpage.cpp')
| -rw-r--r-- | xfa/fde/cfde_txtedtpage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp index c3d21430bd..3a1c9ab88f 100644 --- a/xfa/fde/cfde_txtedtpage.cpp +++ b/xfa/fde/cfde_txtedtpage.cpp @@ -296,16 +296,16 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox, if (!CFX_BreakTypeNoneOrPiece(dwBreakStatus)) { int32_t nPieceCount = pBreak->CountBreakPieces(); for (int32_t j = 0; j < nPieceCount; j++) { - const CFX_BreakPiece* pPiece = pBreak->GetBreakPiece(j); + const CFX_BreakPiece* pPiece = pBreak->GetBreakPieceUnstable(j); FDE_TEXTEDITPIECE TxtEdtPiece; FXSYS_memset(&TxtEdtPiece, 0, sizeof(FDE_TEXTEDITPIECE)); TxtEdtPiece.nBidiLevel = pPiece->m_iBidiLevel; TxtEdtPiece.nCount = pPiece->GetLength(); TxtEdtPiece.nStart = nPieceStart; TxtEdtPiece.dwCharStyles = pPiece->m_dwCharStyles; - if (FX_IsOdd(pPiece->m_iBidiLevel)) { + if (FX_IsOdd(pPiece->m_iBidiLevel)) TxtEdtPiece.dwCharStyles |= FX_TXTCHARSTYLE_OddBidiLevel; - } + float fParaBreakWidth = 0.0f; if (!CFX_BreakTypeNoneOrPiece(pPiece->m_dwStatus)) { wchar_t wRtChar = pParams->wLineBreakChar; |