From 0bf9aef229ae2c4f2f16ab753d6d2e9e6d718a44 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Nov 2017 13:44:38 +0000 Subject: Convert TryInteger to return an optional This Cl changes CJX_Node::TryInteger to return a pdfium::Optional instead of a boolean with an out param. Change-Id: I4675e08d3b132041f7d87e4639efa1d555089dc2 Reviewed-on: https://pdfium-review.googlesource.com/18511 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_widgetdata.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp') diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 1a39e2a525..90d02994de 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -1350,8 +1350,13 @@ bool CXFA_WidgetData::GetFracDigits(int32_t& iFracDigits) { if (!pChild) return false; - return pChild->JSNode()->TryInteger(XFA_Attribute::FracDigits, iFracDigits, - true); + pdfium::Optional ret = + pChild->JSNode()->TryInteger(XFA_Attribute::FracDigits, true); + if (!ret) + return false; + + iFracDigits = *ret; + return true; } bool CXFA_WidgetData::GetLeadDigits(int32_t& iLeadDigits) { @@ -1365,8 +1370,13 @@ bool CXFA_WidgetData::GetLeadDigits(int32_t& iLeadDigits) { if (!pChild) return false; - return pChild->JSNode()->TryInteger(XFA_Attribute::LeadDigits, iLeadDigits, - true); + pdfium::Optional ret = + pChild->JSNode()->TryInteger(XFA_Attribute::LeadDigits, true); + if (!ret) + return false; + + iLeadDigits = *ret; + return true; } bool CXFA_WidgetData::SetValue(const WideString& wsValue, -- cgit v1.2.3