diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-20 20:35:48 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-20 20:35:48 +0000 |
| commit | 1b36b90f2e33f5a80e6ae9b22821a623a9d62782 (patch) | |
| tree | 60c79894c81732faa6a5fba7f7fd56ff8b602ecc /xfa/fxfa/parser/cxfa_node.cpp | |
| parent | 71803d230109cb841a323c579082a5cbd6fcbe3c (diff) | |
| download | pdfium-1b36b90f2e33f5a80e6ae9b22821a623a9d62782.tar.xz | |
Convert picture methods to return the string
This CL converts CXFA_BindData::GetPicture and
CXFA_WidgetData::GetPictureContent to return the WideString instead of
taking an out param.
The original bool result was never checked.
Change-Id: I4503d53ac7276edea811a28c34c7d8cc4cb50572
Reviewed-on: https://pdfium-review.googlesource.com/18810
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_node.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index c667c08d10..185b2a935a 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -472,11 +472,12 @@ CXFA_WidgetData* CXFA_Node::GetContainerWidgetData() { } else { WideString wsPicture; if (pFieldWidgetData) { - pFieldWidgetData->GetPictureContent(wsPicture, - XFA_VALUEPICTURE_DataBind); + wsPicture = + pFieldWidgetData->GetPictureContent(XFA_VALUEPICTURE_DataBind); } if (!wsPicture.IsEmpty()) return pFieldWidgetData; + CXFA_Node* pDataNode = GetBindData(); if (!pDataNode) return nullptr; @@ -486,8 +487,8 @@ CXFA_WidgetData* CXFA_Node::GetContainerWidgetData() { continue; pFieldWidgetData = pFormNode->GetWidgetData(); if (pFieldWidgetData) { - pFieldWidgetData->GetPictureContent(wsPicture, - XFA_VALUEPICTURE_DataBind); + wsPicture = + pFieldWidgetData->GetPictureContent(XFA_VALUEPICTURE_DataBind); } if (!wsPicture.IsEmpty()) break; |