diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-16 14:07:17 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-16 14:07:17 +0000 |
| commit | 9d47de6b27b167db46b6aba38352fc42a8b6adae (patch) | |
| tree | 5e29b94aa126a890cf9c2741b505c4dce9dae42e /xfa/fxfa/parser/cxfa_captiondata.cpp | |
| parent | 0bf9aef229ae2c4f2f16ab753d6d2e9e6d718a44 (diff) | |
| download | pdfium-9d47de6b27b167db46b6aba38352fc42a8b6adae.tar.xz | |
Convert TryEnum to return an optional
This CL converts CJX_Node::TryEnum to return a pdfium::Optional instead
of a bool with an out parameter.
Change-Id: Icc1b063ce51656cc5e467aba358eb9e7d6754fea
Reviewed-on: https://pdfium-review.googlesource.com/18512
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_captiondata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_captiondata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_captiondata.cpp b/xfa/fxfa/parser/cxfa_captiondata.cpp index c898a763ac..db7ca9d875 100644 --- a/xfa/fxfa/parser/cxfa_captiondata.cpp +++ b/xfa/fxfa/parser/cxfa_captiondata.cpp @@ -12,15 +12,15 @@ CXFA_CaptionData::CXFA_CaptionData(CXFA_Node* pNode) : CXFA_DataData(pNode) {} int32_t CXFA_CaptionData::GetPresence() { - XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Visible; - m_pNode->JSNode()->TryEnum(XFA_Attribute::Presence, eAttr, true); - return eAttr; + return m_pNode->JSNode() + ->TryEnum(XFA_Attribute::Presence, true) + .value_or(XFA_ATTRIBUTEENUM_Visible); } int32_t CXFA_CaptionData::GetPlacementType() { - XFA_ATTRIBUTEENUM eAttr = XFA_ATTRIBUTEENUM_Left; - m_pNode->JSNode()->TryEnum(XFA_Attribute::Placement, eAttr, true); - return eAttr; + return m_pNode->JSNode() + ->TryEnum(XFA_Attribute::Placement, true) + .value_or(XFA_ATTRIBUTEENUM_Left); } float CXFA_CaptionData::GetReserve() { |