diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-10 22:13:45 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-10 22:13:45 +0000 |
| commit | 7f302e511fe86611a311748cd7b9dbb18ceea156 (patch) | |
| tree | 1354c0dcf63615ba070039fc54c8f200d359db89 /xfa/fxfa/cxfa_textparser.cpp | |
| parent | 962760426dcb1801683e6fd91c4f3650eea51155 (diff) | |
| download | pdfium-7f302e511fe86611a311748cd7b9dbb18ceea156.tar.xz | |
Rename GetPara to GetParaIfExistschromium/3318
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 <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textparser.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp index 0fd59a0852..07ba896843 100644 --- a/xfa/fxfa/cxfa_textparser.cpp +++ b/xfa/fxfa/cxfa_textparser.cpp @@ -92,7 +92,7 @@ std::unique_ptr<CFX_CSSStyleSheet> CXFA_TextParser::LoadDefaultSheetStyle() { RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateRootStyle( CXFA_TextProvider* pTextProvider) { - CXFA_Para* para = pTextProvider->GetPara(); + CXFA_Para* para = pTextProvider->GetParaIfExists(); auto pStyle = m_pSelector->CreateComputedStyle(nullptr); float fLineHeight = 0; float fFontSize = 10; @@ -297,7 +297,7 @@ std::unique_ptr<CXFA_TextParser::TagProvider> CXFA_TextParser::ParseTagInfo( XFA_AttributeEnum CXFA_TextParser::GetVAlign( CXFA_TextProvider* pTextProvider) const { - CXFA_Para* para = pTextProvider->GetPara(); + CXFA_Para* para = pTextProvider->GetParaIfExists(); return para ? para->GetVerticalAlign() : XFA_AttributeEnum::Top; } @@ -476,7 +476,7 @@ float CXFA_TextParser::GetLineHeight(CXFA_TextProvider* pTextProvider, if (pStyle) { fLineHeight = pStyle->GetLineHeight(); } else { - CXFA_Para* para = pTextProvider->GetPara(); + CXFA_Para* para = pTextProvider->GetParaIfExists(); if (para) fLineHeight = para->GetLineHeight(); } |