From 7f302e511fe86611a311748cd7b9dbb18ceea156 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 10 Jan 2018 22:13:45 +0000 Subject: Rename GetPara to GetParaIfExists This CL renames GetPara to make it explicit it can return nullptr. Change-Id: I7c6529c15646b9947964e25a8d28938b38f091d6 Reviewed-on: https://pdfium-review.googlesource.com/22680 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_textlayout.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/cxfa_textlayout.cpp') diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index 15ac909e2e..d252a36ade 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -104,7 +104,7 @@ std::unique_ptr CXFA_TextLayout::CreateBreak(bool bDefault) { } void CXFA_TextLayout::InitBreak(float fLineWidth) { - CXFA_Para* para = m_pTextProvider->GetPara(); + CXFA_Para* para = m_pTextProvider->GetParaIfExists(); float fStart = 0; float fStartPos = 0; if (para) { @@ -652,7 +652,7 @@ void CXFA_TextLayout::LoadText(CXFA_Node* pNode, bool bSavePieces) { InitBreak(textWidth); - CXFA_Para* para = m_pTextProvider->GetPara(); + CXFA_Para* para = m_pTextProvider->GetParaIfExists(); float fSpaceAbove = 0; if (para) { fSpaceAbove = para->GetSpaceAbove(); @@ -1100,7 +1100,7 @@ void CXFA_TextLayout::AppendTextLine(CFX_BreakType dwStatus, if (dwStatus == CFX_BreakType::Paragraph) { m_pBreak->Reset(); if (!pStyle && bEndBreak) { - CXFA_Para* para = m_pTextProvider->GetPara(); + CXFA_Para* para = m_pTextProvider->GetParaIfExists(); if (para) { float fStartPos = para->GetMarginLeft(); float fIndent = para->GetTextIndent(); -- cgit v1.2.3