From e1ffa59d93e40a783107c0cf847b387741b96d48 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 18:33:11 +0000 Subject: Rename CXFA_BindItems to CXFA_BindItemsData This CL renames CXFA_BindItems to CXFA_BindItemsData to make it clear it's part of the data hierarchy. Change-Id: Ied3f85510e311c1ac16aa2d5e29a151cbe0c5f15 Reviewed-on: https://pdfium-review.googlesource.com/17972 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- BUILD.gn | 4 ++-- xfa/fxfa/cxfa_ffdocview.cpp | 10 +++++----- xfa/fxfa/parser/cxfa_binditems.cpp | 28 ---------------------------- xfa/fxfa/parser/cxfa_binditems.h | 25 ------------------------- xfa/fxfa/parser/cxfa_binditemsdata.cpp | 28 ++++++++++++++++++++++++++++ xfa/fxfa/parser/cxfa_binditemsdata.h | 25 +++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 xfa/fxfa/parser/cxfa_binditems.cpp delete mode 100644 xfa/fxfa/parser/cxfa_binditems.h create mode 100644 xfa/fxfa/parser/cxfa_binditemsdata.cpp create mode 100644 xfa/fxfa/parser/cxfa_binditemsdata.h diff --git a/BUILD.gn b/BUILD.gn index 65fe6a025d..fc0fde5e69 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -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_binditems.cpp deleted file mode 100644 index 578ed4664f..0000000000 --- a/xfa/fxfa/parser/cxfa_binditems.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa/fxfa/parser/cxfa_binditems.h" - -#include "xfa/fxfa/parser/cxfa_node.h" - -CXFA_BindItems::CXFA_BindItems(CXFA_Node* pNode) : CXFA_Data(pNode) {} - -void CXFA_BindItems::GetLabelRef(WideStringView& wsLabelRef) { - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LabelRef, wsLabelRef, true); -} - -void CXFA_BindItems::GetValueRef(WideStringView& wsValueRef) { - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_ValueRef, wsValueRef, true); -} - -void CXFA_BindItems::GetRef(WideStringView& wsRef) { - m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Ref, wsRef, true); -} - -bool CXFA_BindItems::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_binditems.h deleted file mode 100644 index 58e50da8ee..0000000000 --- a/xfa/fxfa/parser/cxfa_binditems.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// 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_ - -#include "core/fxcrt/fx_string.h" -#include "xfa/fxfa/parser/cxfa_data.h" - -class CXFA_Node; - -class CXFA_BindItems : public CXFA_Data { - public: - explicit CXFA_BindItems(CXFA_Node* pNode); - - void GetLabelRef(WideStringView& wsLabelRef); - void GetValueRef(WideStringView& wsValueRef); - void GetRef(WideStringView& wsRef); - bool SetConnection(const WideString& wsConnection); -}; - -#endif // XFA_FXFA_PARSER_CXFA_BINDITEMS_H_ diff --git a/xfa/fxfa/parser/cxfa_binditemsdata.cpp b/xfa/fxfa/parser/cxfa_binditemsdata.cpp new file mode 100644 index 0000000000..f26efc327c --- /dev/null +++ b/xfa/fxfa/parser/cxfa_binditemsdata.cpp @@ -0,0 +1,28 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#include "xfa/fxfa/parser/cxfa_binditemsdata.h" + +#include "xfa/fxfa/parser/cxfa_node.h" + +CXFA_BindItemsData::CXFA_BindItemsData(CXFA_Node* pNode) : CXFA_Data(pNode) {} + +void CXFA_BindItemsData::GetLabelRef(WideStringView& wsLabelRef) { + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_LabelRef, wsLabelRef, true); +} + +void CXFA_BindItemsData::GetValueRef(WideStringView& wsValueRef) { + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_ValueRef, wsValueRef, true); +} + +void CXFA_BindItemsData::GetRef(WideStringView& wsRef) { + m_pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Ref, wsRef, true); +} + +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_binditemsdata.h b/xfa/fxfa/parser/cxfa_binditemsdata.h new file mode 100644 index 0000000000..664239a8ae --- /dev/null +++ b/xfa/fxfa/parser/cxfa_binditemsdata.h @@ -0,0 +1,25 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#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_BindItemsData : public CXFA_Data { + public: + explicit CXFA_BindItemsData(CXFA_Node* pNode); + + void GetLabelRef(WideStringView& wsLabelRef); + void GetValueRef(WideStringView& wsValueRef); + void GetRef(WideStringView& wsRef); + bool SetConnection(const WideString& wsConnection); +}; + +#endif // XFA_FXFA_PARSER_CXFA_BINDITEMSDATA_H_ -- cgit v1.2.3