From 2501ae2474c1f097a06634d647de2eb3fb730864 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 20 Nov 2017 21:19:13 +0000 Subject: Remove CXFA_DataData operator bool override This CL removes CXFA_DataData::operator bool in favour of an explicit HasValidNode method. This makes the call sites a lot clearer. Change-Id: I6fae14fdeec4674ca7916e21b9e5703070fc3069 Reviewed-on: https://pdfium-review.googlesource.com/18830 Commit-Queue: dsinclair Reviewed-by: Ryan Harrison --- xfa/fxfa/cxfa_textlayout.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_textlayout.cpp') diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index bec116c65e..93c1beebf7 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -105,7 +105,7 @@ void CXFA_TextLayout::InitBreak(float fLineWidth) { CXFA_ParaData paraData = m_pTextProvider->GetParaData(); float fStart = 0; float fStartPos = 0; - if (paraData) { + if (paraData.HasValidNode()) { CFX_RTFLineAlignment iAlign = CFX_RTFLineAlignment::Left; switch (paraData.GetHorizontalAlign()) { case XFA_ATTRIBUTEENUM_Center: @@ -143,7 +143,7 @@ void CXFA_TextLayout::InitBreak(float fLineWidth) { m_pBreak->SetLineStartPos(fStartPos); CXFA_FontData fontData = m_pTextProvider->GetFontData(); - if (fontData) { + if (fontData.HasValidNode()) { m_pBreak->SetHorizontalScale( static_cast(fontData.GetHorizontalScale())); m_pBreak->SetVerticalScale( @@ -647,7 +647,7 @@ void CXFA_TextLayout::LoadText(CXFA_Node* pNode, CXFA_ParaData paraData = m_pTextProvider->GetParaData(); float fSpaceAbove = 0; - if (paraData) { + if (paraData.HasValidNode()) { fSpaceAbove = paraData.GetSpaceAbove(); if (fSpaceAbove < 0.1f) { fSpaceAbove = 0; @@ -1092,7 +1092,7 @@ void CXFA_TextLayout::AppendTextLine(CFX_BreakType dwStatus, m_pBreak->Reset(); if (!pStyle && bEndBreak) { CXFA_ParaData paraData = m_pTextProvider->GetParaData(); - if (paraData) { + if (paraData.HasValidNode()) { float fStartPos = paraData.GetMarginLeft(); float fIndent = paraData.GetTextIndent(); if (fIndent > 0) -- cgit v1.2.3