From 44820980f762797f1ffba61b9f5b8cf0922489a3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 15:11:52 -0500 Subject: Fold CXFA_BindData into CXFA_Bind This CL merges the CXFA_BindData wrapper into CXFA_Bind. Change-Id: I621955be2673938bf08c7897779311b776d0bf8b Reviewed-on: https://pdfium-review.googlesource.com/22131 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_widgetdata.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 a7f157d0a2..9c08c1ac43 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -336,9 +336,9 @@ CXFA_Validate* CXFA_WidgetData::GetValidate(bool bModified) { 0, XFA_Element::Validate, bModified); } -CXFA_BindData CXFA_WidgetData::GetBindData() { - return CXFA_BindData( - m_pNode->JSObject()->GetProperty(0, XFA_Element::Bind, false)); +CXFA_Bind* CXFA_WidgetData::GetBind() { + return m_pNode->JSObject()->GetProperty(0, XFA_Element::Bind, + false); } pdfium::Optional CXFA_WidgetData::TryWidth() { @@ -1489,9 +1489,9 @@ WideString CXFA_WidgetData::GetPictureContent(XFA_VALUEPICTURE ePicture) { } } case XFA_VALUEPICTURE_DataBind: { - CXFA_BindData bindData = GetBindData(); - if (bindData.HasValidNode()) - return bindData.GetPicture(); + CXFA_Bind* bind = GetBind(); + if (bind) + return bind->GetPicture(); break; } default: -- cgit v1.2.3