diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffdocview.cpp | 10 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_binditemsdata.cpp (renamed from xfa/fxfa/parser/cxfa_binditems.cpp) | 12 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_binditemsdata.h (renamed from xfa/fxfa/parser/cxfa_binditems.h) | 10 |
4 files changed, 18 insertions, 18 deletions
@@ -1794,8 +1794,8 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cxfa_attachnodelist.h", "xfa/fxfa/parser/cxfa_bind.cpp", "xfa/fxfa/parser/cxfa_bind.h", - "xfa/fxfa/parser/cxfa_binditems.cpp", - "xfa/fxfa/parser/cxfa_binditems.h", + "xfa/fxfa/parser/cxfa_binditemsdata.cpp", + "xfa/fxfa/parser/cxfa_binditemsdata.h", "xfa/fxfa/parser/cxfa_border.h", "xfa/fxfa/parser/cxfa_box.cpp", "xfa/fxfa/parser/cxfa_box.h", diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp index 28517089ee..3302e40f5d 100644 --- a/xfa/fxfa/cxfa_ffdocview.cpp +++ b/xfa/fxfa/cxfa_ffdocview.cpp @@ -29,7 +29,7 @@ #include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h" #include "xfa/fxfa/cxfa_textprovider.h" #include "xfa/fxfa/cxfa_widgetacciterator.h" -#include "xfa/fxfa/parser/cxfa_binditems.h" +#include "xfa/fxfa/parser/cxfa_binditemsdata.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" @@ -718,11 +718,11 @@ void CXFA_FFDocView::RunBindItems() { if (!pAcc) continue; - CXFA_BindItems binditems(item); + CXFA_BindItemsData bindItemsData(item); CFXJSE_Engine* pScriptContext = pWidgetNode->GetDocument()->GetScriptContext(); WideStringView wsRef; - binditems.GetRef(wsRef); + bindItemsData.GetRef(wsRef); uint32_t dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_ALL; @@ -733,8 +733,8 @@ void CXFA_FFDocView::RunBindItems() { continue; WideStringView wsValueRef, wsLabelRef; - binditems.GetValueRef(wsValueRef); - binditems.GetLabelRef(wsLabelRef); + bindItemsData.GetValueRef(wsValueRef); + bindItemsData.GetLabelRef(wsLabelRef); const bool bUseValue = wsLabelRef.IsEmpty() || wsLabelRef == wsValueRef; const bool bLabelUseContent = wsLabelRef.IsEmpty() || wsLabelRef == L"$"; const bool bValueUseContent = wsValueRef.IsEmpty() || wsValueRef == L"$"; diff --git a/xfa/fxfa/parser/cxfa_binditems.cpp b/xfa/fxfa/parser/cxfa_binditemsdata.cpp index 578ed4664f..f26efc327c 100644 --- a/xfa/fxfa/parser/cxfa_binditems.cpp +++ b/xfa/fxfa/parser/cxfa_binditemsdata.cpp @@ -4,25 +4,25 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/parser/cxfa_binditems.h" +#include "xfa/fxfa/parser/cxfa_binditemsdata.h" #include "xfa/fxfa/parser/cxfa_node.h" -CXFA_BindItems::CXFA_BindItems(CXFA_Node* pNode) : CXFA_Data(pNode) {} +CXFA_BindItemsData::CXFA_BindItemsData(CXFA_Node* pNode) : CXFA_Data(pNode) {} -void CXFA_BindItems::GetLabelRef(WideStringView& wsLabelRef) { +void CXFA_BindItemsData::GetLabelRef(WideStringView& wsLabelRef) { m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LabelRef, wsLabelRef, true); } -void CXFA_BindItems::GetValueRef(WideStringView& wsValueRef) { +void CXFA_BindItemsData::GetValueRef(WideStringView& wsValueRef) { m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_ValueRef, wsValueRef, true); } -void CXFA_BindItems::GetRef(WideStringView& wsRef) { +void CXFA_BindItemsData::GetRef(WideStringView& wsRef) { m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Ref, wsRef, true); } -bool CXFA_BindItems::SetConnection(const WideString& wsConnection) { +bool CXFA_BindItemsData::SetConnection(const WideString& wsConnection) { return m_pNode->JSNode()->SetCData(XFA_ATTRIBUTE_Connection, wsConnection, false, false); } diff --git a/xfa/fxfa/parser/cxfa_binditems.h b/xfa/fxfa/parser/cxfa_binditemsdata.h index 58e50da8ee..664239a8ae 100644 --- a/xfa/fxfa/parser/cxfa_binditems.h +++ b/xfa/fxfa/parser/cxfa_binditemsdata.h @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ -#define XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ +#ifndef XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_ +#define XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_ #include "core/fxcrt/fx_string.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; -class CXFA_BindItems : public CXFA_Data { +class CXFA_BindItemsData : public CXFA_Data { public: - explicit CXFA_BindItems(CXFA_Node* pNode); + explicit CXFA_BindItemsData(CXFA_Node* pNode); void GetLabelRef(WideStringView& wsLabelRef); void GetValueRef(WideStringView& wsValueRef); @@ -22,4 +22,4 @@ class CXFA_BindItems : public CXFA_Data { bool SetConnection(const WideString& wsConnection); }; -#endif // XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ +#endif // XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_ |