summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_ffdocview.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-03 15:22:37 -0500
committerChromium commit bot <commit-bot@chromium.org>2018-01-03 21:15:21 +0000
commit368c634f87eb5fdf03a532d3125d9b6c5400f61a (patch)
tree9b029f7d1cb63f56f187b28c898a112a42913969 /xfa/fxfa/cxfa_ffdocview.cpp
parent44820980f762797f1ffba61b9f5b8cf0922489a3 (diff)
downloadpdfium-368c634f87eb5fdf03a532d3125d9b6c5400f61a.tar.xz
Fold CXFA_BindItemsData into CXFA_BindItems
This CL merges CXFA_BindItemsData into the CXFA_BindItems class. Change-Id: I424274fcd6a9a4376d78794b1014988c3649602f Reviewed-on: https://pdfium-review.googlesource.com/22170 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffdocview.cpp')
-rw-r--r--xfa/fxfa/cxfa_ffdocview.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index bd2b70920d..1160d55999 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -30,7 +30,7 @@
#include "xfa/fxfa/cxfa_textprovider.h"
#include "xfa/fxfa/cxfa_widgetacciterator.h"
#include "xfa/fxfa/parser/cxfa_acrobat.h"
-#include "xfa/fxfa/parser/cxfa_binditemsdata.h"
+#include "xfa/fxfa/parser/cxfa_binditems.h"
#include "xfa/fxfa/parser/cxfa_calculate.h"
#include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
#include "xfa/fxfa/parser/cxfa_pageset.h"
@@ -717,10 +717,9 @@ void CXFA_FFDocView::RunBindItems() {
if (!pAcc)
continue;
- CXFA_BindItemsData bindItemsData(item);
CFXJSE_Engine* pScriptContext =
pWidgetNode->GetDocument()->GetScriptContext();
- WideString wsRef = bindItemsData.GetRef();
+ WideString wsRef = item->GetRef();
uint32_t dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent |
XFA_RESOLVENODE_ALL;
@@ -731,8 +730,8 @@ void CXFA_FFDocView::RunBindItems() {
if (rs.dwFlags != XFA_ResolveNode_RSType_Nodes || rs.objects.empty())
continue;
- WideString wsValueRef = bindItemsData.GetValueRef();
- WideString wsLabelRef = bindItemsData.GetLabelRef();
+ WideString wsValueRef = item->GetValueRef();
+ WideString wsLabelRef = item->GetLabelRef();
const bool bUseValue = wsLabelRef.IsEmpty() || wsLabelRef == wsValueRef;
const bool bLabelUseContent = wsLabelRef.IsEmpty() || wsLabelRef == L"$";
const bool bValueUseContent = wsValueRef.IsEmpty() || wsValueRef == L"$";