diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-14 10:26:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-14 14:50:00 +0000 |
| commit | dff02cee2d2410d81a55c59345fb38b5aac8a457 (patch) | |
| tree | d09dfb18aeb7ae4af4ec96ab0034c6aafbcee883 /xfa/fde/cfde_txtedtengine.cpp | |
| parent | aeac95192c106b41c058c8372aa2ec8d0092f60b (diff) | |
| download | pdfium-dff02cee2d2410d81a55c59345fb38b5aac8a457.tar.xz | |
Cleanup FDE_TTO{STYLE|ALIGNMENT} defines.
This CL replaceds FDE_TTOSTYLE defines with a FDE_TextStyle struct which
is used to set the needed flags. The FDE_TTOALIGNMENT defines are
replaced with an enum class and unused members have been removed.
Change-Id: Ib0e2818a82e7f1961de57f8d15703477f8235a03
Reviewed-on: https://pdfium-review.googlesource.com/10530
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_txtedtengine.cpp')
| -rw-r--r-- | xfa/fde/cfde_txtedtengine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index a8445b028e..aaf0d21712 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -1321,13 +1321,14 @@ bool CFDE_TxtEdtEngine::IsFitArea(CFX_WideString& wsText) { pTextOut->SetLineSpace(m_Param.fLineSpace); pTextOut->SetFont(m_Param.pFont); pTextOut->SetFontSize(m_Param.fFontSize); - uint32_t dwStyle = 0; + + FDE_TextStyle dwStyle; if (!(m_Param.dwMode & FDE_TEXTEDITMODE_MultiLines)) - dwStyle |= FDE_TTOSTYLE_SingleLine; + dwStyle.single_line_ = true; CFX_RectF rcText; if (m_Param.dwMode & FDE_TEXTEDITMODE_AutoLineWrap) { - dwStyle |= FDE_TTOSTYLE_LineWrap; + dwStyle.line_wrap_ = true; rcText.width = m_Param.fPlateWidth; } else { rcText.width = 65535; |