diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-01-04 14:43:27 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 20:19:41 +0000 |
| commit | c560a8c11a6f8ee239e570db8c022ae0fd2a4db5 (patch) | |
| tree | 0c16389f7e5c5e29c57a9c7f77dd062fa07d8640 /xfa/fxfa/parser/cxfa_occur.cpp | |
| parent | df0a749452d933e4f434e2a33112667f1880db34 (diff) | |
| download | pdfium-c560a8c11a6f8ee239e570db8c022ae0fd2a4db5.tar.xz | |
Convert usages of pdfium::Optional to Optional
Change-Id: I29769f78eaad10c6a8b79e27524336c4f330377e
Reviewed-on: https://pdfium-review.googlesource.com/22258
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_occur.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occur.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp index 441394c567..7be3f7066d 100644 --- a/xfa/fxfa/parser/cxfa_occur.cpp +++ b/xfa/fxfa/parser/cxfa_occur.cpp @@ -40,14 +40,12 @@ CXFA_Occur::CXFA_Occur(CXFA_Document* doc, XFA_PacketType packet) CXFA_Occur::~CXFA_Occur() {} int32_t CXFA_Occur::GetMax() { - pdfium::Optional<int32_t> max = - JSObject()->TryInteger(XFA_Attribute::Max, true); + Optional<int32_t> max = JSObject()->TryInteger(XFA_Attribute::Max, true); return max ? *max : GetMin(); } int32_t CXFA_Occur::GetMin() { - pdfium::Optional<int32_t> min = - JSObject()->TryInteger(XFA_Attribute::Min, true); + Optional<int32_t> min = JSObject()->TryInteger(XFA_Attribute::Min, true); return min && *min >= 0 ? *min : 1; } @@ -55,7 +53,7 @@ std::tuple<int32_t, int32_t, int32_t> CXFA_Occur::GetOccurInfo() { int32_t iMin = GetMin(); int32_t iMax = GetMax(); - pdfium::Optional<int32_t> init = + Optional<int32_t> init = JSObject()->TryInteger(XFA_Attribute::Initial, false); return {iMin, iMax, init && *init >= iMin ? *init : iMin}; } |