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/parser | |
| 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/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 54b4661ce3..093d83a67d 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1562,7 +1562,7 @@ float CXFA_Node::GetFontSize() const { float CXFA_Node::GetLineHeight() const { float fLineHeight = 0; - CXFA_Para* para = GetPara(); + CXFA_Para* para = GetParaIfExists(); if (para) fLineHeight = para->GetLineHeight(); @@ -1580,7 +1580,7 @@ CXFA_Margin* CXFA_Node::GetMarginIfExists() const { return JSObject()->GetProperty<CXFA_Margin>(0, XFA_Element::Margin); } -CXFA_Para* CXFA_Node::GetPara() const { +CXFA_Para* CXFA_Node::GetParaIfExists() const { return JSObject()->GetProperty<CXFA_Para>(0, XFA_Element::Para); } diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 1dcaeec0e5..ed3b21d1e2 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -247,7 +247,7 @@ class CXFA_Node : public CXFA_Object { float GetLineHeight() const; CXFA_Margin* GetMarginIfExists() const; - CXFA_Para* GetPara() const; + CXFA_Para* GetParaIfExists() const; CXFA_Calculate* GetCalculate() const; CXFA_Validate* GetValidate() const; CXFA_Validate* GetOrCreateValidate(); |