diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-28 11:34:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-28 11:34:42 -0700 |
| commit | 95e5834ab6b6e5aa370cacd6266cecbd82c4c155 (patch) | |
| tree | a948ed773fe1faad6a6b2f4111e8f0c897ef4f40 /xfa/fde | |
| parent | 159ba95782e0610b217c42a60bbfbd99737e0771 (diff) | |
| download | pdfium-95e5834ab6b6e5aa370cacd6266cecbd82c4c155.tar.xz | |
Continue fixing FX_BOOL / int noise
Review-Url: https://codereview.chromium.org/2459073002
Diffstat (limited to 'xfa/fde')
| -rw-r--r-- | xfa/fde/cfde_txtedtengine.cpp | 6 | ||||
| -rw-r--r-- | xfa/fde/cfde_txtedtpage.cpp | 2 | ||||
| -rw-r--r-- | xfa/fde/css/fde_cssdeclaration.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index 32df561d7e..60ad6090a6 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -1339,7 +1339,7 @@ FX_BOOL CFDE_TxtEdtEngine::MoveUp(CFX_PointF& ptCaret) { ptCaret.x = m_rtCaret.left + m_rtCaret.width / 2 - m_Param.fLineSpace; ptCaret.y = m_fCaretPosReserve; FX_BOOL bLineReserve = - m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve; + !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve); if (ptCaret.x < rtContent.left) { if (bLineReserve) { if (m_nCaretPage == CountPages() - 1) { @@ -1383,7 +1383,7 @@ FX_BOOL CFDE_TxtEdtEngine::MoveDown(CFX_PointF& ptCaret) { ptCaret.y = m_fCaretPosReserve; if (ptCaret.x >= rtContent.right()) { FX_BOOL bLineReserve = - m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve; + !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve); if (bLineReserve) { if (m_nCaretPage == 0) { return FALSE; @@ -1566,7 +1566,7 @@ void CFDE_TxtEdtEngine::GetCaretRect(CFX_RectF& rtCaret, FX_BOOL bBefore) { IFDE_TxtEdtPage* pPage = m_PagePtrArray[m_nCaretPage]; m_Param.pEventSink->On_PageLoad(this, m_nCaretPage, 0); - FX_BOOL bCombText = m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CombText; + FX_BOOL bCombText = !!(m_Param.dwLayoutStyles & FDE_TEXTEDITLAYOUT_CombText); int32_t nIndexInpage = nCaret - pPage->GetCharStart(); if (bBefore && bCombText && nIndexInpage > 0) { nIndexInpage--; diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp index 24eab86e0b..9f0d29f63d 100644 --- a/xfa/fde/cfde_txtedtpage.cpp +++ b/xfa/fde/cfde_txtedtpage.cpp @@ -295,7 +295,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox, nPageEnd += (nTemp - 1); FX_BOOL bVertial = pParams->dwLayoutStyles & FDE_TEXTEDITLAYOUT_DocVertical; FX_BOOL bLineReserve = - pParams->dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve; + !!(pParams->dwLayoutStyles & FDE_TEXTEDITLAYOUT_LineReserve); FX_FLOAT fLineStart = bVertial ? (bLineReserve ? (pParams->fPlateWidth - pParams->fLineSpace) : 0.0f) diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h index d33e7107c8..3598429e3a 100644 --- a/xfa/fde/css/fde_cssdeclaration.h +++ b/xfa/fde/css/fde_cssdeclaration.h @@ -14,7 +14,7 @@ class FDE_CSSPropertyHolder : public CFX_Target { public: int16_t eProperty; - int16_t bImportant; + FX_BOOL bImportant; IFDE_CSSValue* pValue; FDE_CSSPropertyHolder* pNext; }; |