summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xfa/fxfa/parser/xfa_basic_data.cpp16
-rw-r--r--xfa/fxfa/parser/xfa_object.h23
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp6
-rw-r--r--xfa/fxfa/parser/xfa_script_datawindow.cpp12
-rw-r--r--xfa/fxfa/parser/xfa_script_datawindow.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp5
-rw-r--r--xfa/fxfa/parser/xfa_script_eventpseudomodel.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp5
-rw-r--r--xfa/fxfa/parser/xfa_script_hostpseudomodel.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp5
-rw-r--r--xfa/fxfa/parser/xfa_script_layoutpseudomodel.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_logpseudomodel.cpp5
-rw-r--r--xfa/fxfa/parser/xfa_script_logpseudomodel.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp5
-rw-r--r--xfa/fxfa/parser/xfa_script_signaturepseudomodel.h2
15 files changed, 42 insertions, 52 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
index 7c9d7e6bd7..be1df934c2 100644
--- a/xfa/fxfa/parser/xfa_basic_data.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -1206,13 +1206,13 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x240d5e8e, L"issuers", XFA_Element::Issuers,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::Node},
{0x2457a033, L"signaturePseudoModel", XFA_Element::SignaturePseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x24a52f8a, L"wsdlConnection", XFA_Element::WsdlConnection,
XFA_XDPPACKET_ConnectionSet, XFA_ObjectType::Node},
{0x254ebd07, L"debug", XFA_Element::Debug, XFA_XDPPACKET_Config,
XFA_ObjectType::Node},
{0x2655c66a, L"delta", XFA_Element::Delta, XFA_XDPPACKET_Form,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x26c0daec, L"eraNames", XFA_Element::EraNames, XFA_XDPPACKET_LocaleSet,
XFA_ObjectType::Node},
{0x273ab03b, L"modifyAnnots", XFA_Element::ModifyAnnots,
@@ -1278,7 +1278,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
XFA_ObjectType::ContainerNode},
{0x3ef334e3, L"eventPseudoModel", XFA_Element::EventPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x3fadaec0, L"wsdlAddress", XFA_Element::WsdlAddress,
XFA_XDPPACKET_ConnectionSet, XFA_ObjectType::TextNode},
{0x40623b5b, L"solid", XFA_Element::Solid,
@@ -1347,7 +1347,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x56ae179e, L"handler", XFA_Element::Handler,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::TextNode},
{0x5700bd5f, L"hostPseudoModel", XFA_Element::HostPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x570ce835, L"presence", XFA_Element::Presence, XFA_XDPPACKET_Config,
XFA_ObjectType::NodeV},
{0x5779d65f, L"record", XFA_Element::Record, XFA_XDPPACKET_Config,
@@ -1388,7 +1388,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x68a16bbd, L"webClient", XFA_Element::WebClient, XFA_XDPPACKET_Config,
XFA_ObjectType::Node},
{0x69f115df, L"layoutPseudoModel", XFA_Element::LayoutPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0x6a4bc084, L"producer", XFA_Element::Producer, XFA_XDPPACKET_Config,
XFA_ObjectType::ContentNode},
{0x6a9e04c9, L"corner", XFA_Element::Corner,
@@ -1452,7 +1452,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x830e688f, L"signing", XFA_Element::Signing,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::Node},
{0x83a550d2, L"dataWindow", XFA_Element::DataWindow, XFA_XDPPACKET_Datasets,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x83dab9f5, L"script", XFA_Element::Script,
XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form,
XFA_ObjectType::ContentNode},
@@ -1504,7 +1504,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0x9c6471b3, L"delete", XFA_Element::Delete, XFA_XDPPACKET_SourceSet,
XFA_ObjectType::TextNode},
{0x9deea61d, L"deltas", XFA_Element::Deltas, XFA_XDPPACKET_Form,
- XFA_ObjectType::OrdinaryObject},
+ XFA_ObjectType::Object},
{0x9e67de21, L"digestMethod", XFA_Element::DigestMethod,
XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, XFA_ObjectType::NodeC},
{0x9f3e9510, L"instanceManager", XFA_Element::InstanceManager,
@@ -1624,7 +1624,7 @@ const XFA_ELEMENTINFO g_XFAElementData[] = {
{0xd17a6c30, L"renderPolicy", XFA_Element::RenderPolicy,
XFA_XDPPACKET_Config, XFA_ObjectType::ContentNode},
{0xd4bf6823, L"logPseudoModel", XFA_Element::LogPseudoModel,
- XFA_XDPPACKET_XDP, XFA_ObjectType::OrdinaryObject},
+ XFA_XDPPACKET_XDP, XFA_ObjectType::Object},
{0xd58aa962, L"destination", XFA_Element::Destination, XFA_XDPPACKET_Config,
XFA_ObjectType::ContentNode},
{0xd6e27f1d, L"value", XFA_Element::Value,
diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
index 67e4a2efad..8b1f2303f6 100644
--- a/xfa/fxfa/parser/xfa_object.h
+++ b/xfa/fxfa/parser/xfa_object.h
@@ -16,10 +16,9 @@
class CXFA_Document;
class CXFA_Node;
class CXFA_NodeList;
-class CXFA_OrdinaryObject;
enum class XFA_ObjectType {
- OrdinaryObject,
+ Object,
OrdinaryList,
NodeList,
Node,
@@ -65,9 +64,6 @@ class CXFA_Object : public CFXJSE_HostObject {
m_objectType == XFA_ObjectType::ContentNode ||
m_objectType == XFA_ObjectType::VariablesThis;
}
- bool IsOrdinaryObject() const {
- return m_objectType == XFA_ObjectType::OrdinaryObject;
- }
bool IsNodeList() const { return m_objectType == XFA_ObjectType::NodeList; }
bool IsOrdinaryList() const {
return m_objectType == XFA_ObjectType::OrdinaryList;
@@ -85,11 +81,9 @@ class CXFA_Object : public CFXJSE_HostObject {
}
CXFA_Node* AsNode();
- CXFA_OrdinaryObject* AsOrdinaryObject();
CXFA_NodeList* AsNodeList();
const CXFA_Node* AsNode() const;
- const CXFA_OrdinaryObject* AsOrdinaryObject() const;
const CXFA_NodeList* AsNodeList() const;
XFA_Element GetElementType() const;
@@ -684,12 +678,6 @@ class CXFA_Node : public CXFA_Object {
XFA_MAPMODULEDATA* m_pMapModuleData;
};
-class CXFA_OrdinaryObject : public CXFA_Object {
- public:
- CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_Element eElement);
- ~CXFA_OrdinaryObject() override;
-};
-
class CXFA_ThisProxy : public CXFA_Object {
public:
CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode);
@@ -797,9 +785,7 @@ typedef CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFANode>
inline CXFA_Node* CXFA_Object::AsNode() {
return IsNode() ? static_cast<CXFA_Node*>(this) : nullptr;
}
-inline CXFA_OrdinaryObject* CXFA_Object::AsOrdinaryObject() {
- return IsOrdinaryObject() ? static_cast<CXFA_OrdinaryObject*>(this) : nullptr;
-}
+
inline CXFA_NodeList* CXFA_Object::AsNodeList() {
return IsNodeList() ? static_cast<CXFA_NodeList*>(this) : nullptr;
}
@@ -807,10 +793,7 @@ inline CXFA_NodeList* CXFA_Object::AsNodeList() {
inline const CXFA_Node* CXFA_Object::AsNode() const {
return IsNode() ? static_cast<const CXFA_Node*>(this) : nullptr;
}
-inline const CXFA_OrdinaryObject* CXFA_Object::AsOrdinaryObject() const {
- return IsOrdinaryObject() ? static_cast<const CXFA_OrdinaryObject*>(this)
- : nullptr;
-}
+
inline const CXFA_NodeList* CXFA_Object::AsNodeList() const {
return IsNodeList() ? static_cast<const CXFA_NodeList*>(this) : nullptr;
}
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index d5a9f2f740..946df7a66a 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -5082,12 +5082,6 @@ void CXFA_Node::MoveBufferMapData(CXFA_Node* pSrcModule,
pSrcModule->MoveBufferMapData(pDstModule, pKey);
}
-CXFA_OrdinaryObject::CXFA_OrdinaryObject(CXFA_Document* pDocument,
- XFA_Element eElement)
- : CXFA_Object(pDocument, XFA_ObjectType::OrdinaryObject, eElement) {}
-
-CXFA_OrdinaryObject::~CXFA_OrdinaryObject() {}
-
CXFA_ThisProxy::CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode)
: CXFA_Object(pThisNode->GetDocument(),
XFA_ObjectType::VariablesThis,
diff --git a/xfa/fxfa/parser/xfa_script_datawindow.cpp b/xfa/fxfa/parser/xfa_script_datawindow.cpp
index 79f3219214..9d307a4abe 100644
--- a/xfa/fxfa/parser/xfa_script_datawindow.cpp
+++ b/xfa/fxfa/parser/xfa_script_datawindow.cpp
@@ -16,29 +16,37 @@
#include "xfa/fxfa/parser/xfa_utils.h"
CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::DataWindow) {
-}
+ : CXFA_Object(pDocument, XFA_ObjectType::Object, XFA_Element::DataWindow) {}
+
CScript_DataWindow::~CScript_DataWindow() {}
+
void CScript_DataWindow::Script_DataWindow_MoveCurrentRecord(
CFXJSE_Arguments* pArguments) {}
+
void CScript_DataWindow::Script_DataWindow_Record(
CFXJSE_Arguments* pArguments) {}
+
void CScript_DataWindow::Script_DataWindow_GotoRecord(
CFXJSE_Arguments* pArguments) {}
+
void CScript_DataWindow::Script_DataWindow_IsRecordGroup(
CFXJSE_Arguments* pArguments) {}
+
void CScript_DataWindow::Script_DataWindow_RecordsBefore(
CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {}
+
void CScript_DataWindow::Script_DataWindow_CurrentRecordNumber(
CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {}
+
void CScript_DataWindow::Script_DataWindow_RecordsAfter(
CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {}
+
void CScript_DataWindow::Script_DataWindow_IsDefined(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
diff --git a/xfa/fxfa/parser/xfa_script_datawindow.h b/xfa/fxfa/parser/xfa_script_datawindow.h
index d896a71e70..b57bd147ae 100644
--- a/xfa/fxfa/parser/xfa_script_datawindow.h
+++ b/xfa/fxfa/parser/xfa_script_datawindow.h
@@ -10,7 +10,7 @@
#include "fxjse/include/cfxjse_arguments.h"
#include "xfa/fxfa/parser/xfa_object.h"
-class CScript_DataWindow : public CXFA_OrdinaryObject {
+class CScript_DataWindow : public CXFA_Object {
public:
CScript_DataWindow(CXFA_Document* pDocument);
~CScript_DataWindow() override;
diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
index b9407d0f86..f6612d1563 100644
--- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
@@ -21,8 +21,9 @@
#include "xfa/fxfa/parser/xfa_utils.h"
CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::EventPseudoModel) {
-}
+ : CXFA_Object(pDocument,
+ XFA_ObjectType::Object,
+ XFA_Element::EventPseudoModel) {}
CScript_EventPseudoModel::~CScript_EventPseudoModel() {}
void Script_EventPseudoModel_StringProperty(CFXJSE_Value* pValue,
CFX_WideString& wsValue,
diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h
index 3a53b0b05d..ef59b3baff 100644
--- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h
+++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h
@@ -30,7 +30,7 @@ enum class XFA_Event {
CancelAction
};
-class CScript_EventPseudoModel : public CXFA_OrdinaryObject {
+class CScript_EventPseudoModel : public CXFA_Object {
public:
explicit CScript_EventPseudoModel(CXFA_Document* pDocument);
~CScript_EventPseudoModel() override;
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
index aabdf95cb5..bd4b73247a 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -28,8 +28,9 @@ CXFA_Node* ToNode(CFXJSE_Value* pValue, CFXJSE_Class* pClass) {
} // namespace
CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::HostPseudoModel) {
-}
+ : CXFA_Object(pDocument,
+ XFA_ObjectType::Object,
+ XFA_Element::HostPseudoModel) {}
CScript_HostPseudoModel::~CScript_HostPseudoModel() {}
void CScript_HostPseudoModel::Script_HostPseudoModel_LoadString(
CFXJSE_Value* pValue,
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h
index 0cbe04aadb..58a2853180 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h
@@ -11,7 +11,7 @@
#include "xfa/fxfa/parser/xfa_document.h"
#include "xfa/fxfa/parser/xfa_object.h"
-class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
+class CScript_HostPseudoModel : public CXFA_Object {
public:
CScript_HostPseudoModel(CXFA_Document* pDocument);
~CScript_HostPseudoModel() override;
diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
index 128f5e1d47..81c7335e30 100644
--- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.cpp
@@ -24,8 +24,9 @@
#include "xfa/fxfa/parser/xfa_utils.h"
CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::LayoutPseudoModel) {
-}
+ : CXFA_Object(pDocument,
+ XFA_ObjectType::Object,
+ XFA_Element::LayoutPseudoModel) {}
CScript_LayoutPseudoModel::~CScript_LayoutPseudoModel() {}
void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_Ready(
CFXJSE_Value* pValue,
diff --git a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h
index 02e25b42f5..506afcd74f 100644
--- a/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h
+++ b/xfa/fxfa/parser/xfa_script_layoutpseudomodel.h
@@ -18,7 +18,7 @@ enum XFA_LAYOUTMODEL_HWXY {
XFA_LAYOUTMODEL_Y
};
-class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject {
+class CScript_LayoutPseudoModel : public CXFA_Object {
public:
explicit CScript_LayoutPseudoModel(CXFA_Document* pDocument);
~CScript_LayoutPseudoModel() override;
diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp
index 002a42769c..7e3c90559a 100644
--- a/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.cpp
@@ -16,8 +16,9 @@
#include "xfa/fxfa/parser/xfa_utils.h"
CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::LogPseudoModel) {
-}
+ : CXFA_Object(pDocument,
+ XFA_ObjectType::Object,
+ XFA_Element::LogPseudoModel) {}
CScript_LogPseudoModel::~CScript_LogPseudoModel() {}
void CScript_LogPseudoModel::Script_LogPseudoModel_Message(
CFXJSE_Arguments* pArguments) {}
diff --git a/xfa/fxfa/parser/xfa_script_logpseudomodel.h b/xfa/fxfa/parser/xfa_script_logpseudomodel.h
index 9e30641264..e05b2c7c6e 100644
--- a/xfa/fxfa/parser/xfa_script_logpseudomodel.h
+++ b/xfa/fxfa/parser/xfa_script_logpseudomodel.h
@@ -10,7 +10,7 @@
#include "fxjse/include/cfxjse_arguments.h"
#include "xfa/fxfa/parser/xfa_object.h"
-class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
+class CScript_LogPseudoModel : public CXFA_Object {
public:
explicit CScript_LogPseudoModel(CXFA_Document* pDocument);
~CScript_LogPseudoModel() override;
diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp
index 9befa177f4..face46bed8 100644
--- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.cpp
@@ -20,8 +20,9 @@
CScript_SignaturePseudoModel::CScript_SignaturePseudoModel(
CXFA_Document* pDocument)
- : CXFA_OrdinaryObject(pDocument, XFA_Element::SignaturePseudoModel) {
-}
+ : CXFA_Object(pDocument,
+ XFA_ObjectType::Object,
+ XFA_Element::SignaturePseudoModel) {}
CScript_SignaturePseudoModel::~CScript_SignaturePseudoModel() {}
void CScript_SignaturePseudoModel::Script_SignaturePseudoModel_Verify(
CFXJSE_Arguments* pArguments) {
diff --git a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h
index 3339ff0852..4fdb96c486 100644
--- a/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h
+++ b/xfa/fxfa/parser/xfa_script_signaturepseudomodel.h
@@ -10,7 +10,7 @@
#include "fxjse/include/cfxjse_arguments.h"
#include "xfa/fxfa/parser/xfa_object.h"
-class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
+class CScript_SignaturePseudoModel : public CXFA_Object {
public:
CScript_SignaturePseudoModel(CXFA_Document* pDocument);
~CScript_SignaturePseudoModel() override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:40:25 +0000