From 1699413c207c228ae7eae3d47e89adacc1146d65 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Mon, 20 Nov 2017 21:16:43 +0000
Subject: Cleanup return types in CXFA_BoxData

This CL cleans up the return types in CXFA_BoxData to use std::tuple and
pdfium::Optional where appropriate.
Change-Id: I0790fb43769185fa4cbdd7460411a3d1120e9fa1
Reviewed-on: https://pdfium-review.googlesource.com/18812
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
---
 xfa/fxfa/parser/cxfa_widgetdata.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(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 894411760c..cff2d6b004 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -379,7 +379,8 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() {
   if (borderData) {
     bool bVisible = false;
     float fThickness = 0;
-    borderData.Get3DStyle(bVisible, fThickness);
+    int32_t iType = 0;
+    std::tie(iType, bVisible, fThickness) = borderData.Get3DStyle();
     if (!bLeft || !bTop || !bRight || !bBottom) {
       std::vector<CXFA_StrokeData> strokes = borderData.GetStrokes();
       if (!bTop)
-- 
cgit v1.2.3