diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-26 18:58:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-26 18:58:39 -0700 |
| commit | 9f7f7f8773410020fbea2be87917591cddd86aab (patch) | |
| tree | 875155af9bef6dea6b450747320d711863902a9e /xfa/fwl/core/ifwl_edit.cpp | |
| parent | f39074c0ae47a84c496782f8b75bcce1e1cfdf59 (diff) | |
| download | pdfium-9f7f7f8773410020fbea2be87917591cddd86aab.tar.xz | |
Fix some FX_BOOL / int noise in xfa
Review-Url: https://codereview.chromium.org/2453983002
Diffstat (limited to 'xfa/fwl/core/ifwl_edit.cpp')
| -rw-r--r-- | xfa/fwl/core/ifwl_edit.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fwl/core/ifwl_edit.cpp b/xfa/fwl/core/ifwl_edit.cpp index 1d769af6cb..e911aa0c8b 100644 --- a/xfa/fwl/core/ifwl_edit.cpp +++ b/xfa/fwl/core/ifwl_edit.cpp @@ -119,7 +119,7 @@ FWL_Error IFWL_Edit::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { m_pEdtEngine->GetText(wsText, 0); CFX_SizeF sz = CalcTextSize( wsText, m_pProperties->m_pThemeProvider, - m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine); + !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine)); rect.Set(0, 0, sz.x, sz.y); } } @@ -690,11 +690,11 @@ void IFWL_Edit::On_TextChanged(CFDE_TxtEdtEngine* pEdit, FX_FLOAT fContentHeight = page->GetContentsBox().height; CFX_RectF rtTemp; GetClientRect(rtTemp); - FX_BOOL bHSelfAdaption = - m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_HSelfAdaption; - FX_BOOL bVSelfAdaption = - m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VSelfAdaption; - FX_BOOL bNeedUpdate = FALSE; + bool bHSelfAdaption = + !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_HSelfAdaption); + bool bVSelfAdaption = + !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VSelfAdaption); + bool bNeedUpdate = false; if (bHSelfAdaption || bVSelfAdaption) { CFWL_EvtEdtPreSelfAdaption evt; evt.m_pSrcTarget = this; @@ -1761,7 +1761,7 @@ void CFWL_EditImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) { m_pOwner->m_pEdtEngine->ClearSelection(); bRepaint = TRUE; } - FX_BOOL bShift = pMsg->m_dwFlags & FWL_KEYFLAG_Shift; + bool bShift = !!(pMsg->m_dwFlags & FWL_KEYFLAG_Shift); if (bShift && m_pOwner->m_nSelStart != nIndex) { int32_t iStart = std::min(m_pOwner->m_nSelStart, nIndex); int32_t iEnd = std::max(m_pOwner->m_nSelStart, nIndex); @@ -1828,8 +1828,8 @@ void CFWL_EditImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) { if (!m_pOwner->m_pEdtEngine) return; FDE_TXTEDTMOVECARET MoveCaret = MC_MoveNone; - FX_BOOL bShift = pMsg->m_dwFlags & FWL_KEYFLAG_Shift; - FX_BOOL bCtrl = pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl; + bool bShift = !!(pMsg->m_dwFlags & FWL_KEYFLAG_Shift); + bool bCtrl = !!(pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl); uint32_t dwKeyCode = pMsg->m_dwKeyCode; switch (dwKeyCode) { case FWL_VKEY_Left: { |