diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-10 19:51:41 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-10 19:51:41 +0000 |
| commit | 678b97f3fc747cc203c036c01d23fe790b230b85 (patch) | |
| tree | 1669701f109d2b5575a6983a37245cd14cd7805a /xfa/fxfa/parser | |
| parent | 78d841011655b868486a45e0fe865a972742aa0c (diff) | |
| download | pdfium-678b97f3fc747cc203c036c01d23fe790b230b85.tar.xz | |
Rename GetOccur to GetOccurIfExists
This CL makes it explicit that GetOccurIfExists can return nullptr and
fixes up the call sites.
Change-Id: I542d0098aa316632239df7f1a5796b4ffe6ba202
Reviewed-on: https://pdfium-review.googlesource.com/22676
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_caption.h | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occur.h | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_caption.h b/xfa/fxfa/parser/cxfa_caption.h index 11c1cec3f4..1b634d8f5c 100644 --- a/xfa/fxfa/parser/cxfa_caption.h +++ b/xfa/fxfa/parser/cxfa_caption.h @@ -15,6 +15,9 @@ class CXFA_Value; class CXFA_Caption : public CXFA_Node { public: + static constexpr XFA_AttributeEnum kDefaultPlacementType = + XFA_AttributeEnum::Left; + CXFA_Caption(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Caption() override; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index d2c1e6fe8b..12a6ee4a0a 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1060,7 +1060,7 @@ CXFA_Node* CXFA_Node::GetInstanceMgrOfSubform() { return pInstanceMgr; } -CXFA_Occur* CXFA_Node::GetOccur() { +CXFA_Occur* CXFA_Node::GetOccurIfExists() { return GetFirstChildByClass<CXFA_Occur>(XFA_Element::Occur); } diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 1972da9183..f4ff51382f 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -224,7 +224,7 @@ class CXFA_Node : public CXFA_Object { int32_t GetNodeSameClassIndex() const; CXFA_Node* GetInstanceMgrOfSubform(); - CXFA_Occur* GetOccur(); + CXFA_Occur* GetOccurIfExists(); Optional<bool> GetDefaultBoolean(XFA_Attribute attr) const; Optional<int32_t> GetDefaultInteger(XFA_Attribute attr) const; diff --git a/xfa/fxfa/parser/cxfa_occur.h b/xfa/fxfa/parser/cxfa_occur.h index 3367b07ae5..070c15ca46 100644 --- a/xfa/fxfa/parser/cxfa_occur.h +++ b/xfa/fxfa/parser/cxfa_occur.h @@ -13,6 +13,9 @@ class CXFA_Occur : public CXFA_Node { public: + static constexpr int32_t kDefaultMax = 1; + static constexpr int32_t kDefaultMin = 1; + CXFA_Occur(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Occur() override; |