diff options
Diffstat (limited to 'xfa/src/fxfa/src/parser')
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 16 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp | 6 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 4 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 22 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 10 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 8 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 26 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 12 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 6 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp | 2 |
13 files changed, 59 insertions, 59 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 2ab094948d..0b5f63efa6 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -561,7 +561,7 @@ XFA_UNIT CXFA_Measurement::GetUnit(const CFX_WideStringC& wsUnit) { }
}
IFX_Stream* XFA_CreateWideTextRead(const CFX_WideString& wsBuffer) {
- return FX_NEW CXFA_WideTextRead(wsBuffer);
+ return new CXFA_WideTextRead(wsBuffer);
}
CXFA_WideTextRead::CXFA_WideTextRead(const CFX_WideString& wsBuffer)
: m_wsBuffer(wsBuffer), m_iPosition(0), m_iRefCount(1) {}
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 2d932a0f2c..42652ad57a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -619,7 +619,7 @@ static CXFA_Node* XFA_DataMerge_FindMatchingDataNode( FX_BOOL bOwnIterator = FALSE;
if (!pIterator) {
bOwnIterator = TRUE;
- pIterator = FX_NEW CXFA_NodeIteratorTemplate<
+ pIterator = new CXFA_NodeIteratorTemplate<
CXFA_Node, CXFA_TraverseStrategy_XFAContainerNode>(pTemplateNode);
}
CXFA_Node* pResult = NULL;
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 8e65f2fc83..e403c22ebe 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -133,37 +133,37 @@ CXFA_Object* CXFA_Document::GetXFANode(FX_DWORD dwNodeNameHash) { }
case XFA_HASHCODE_DataWindow: {
if (m_pScriptDataWindow == NULL) {
- m_pScriptDataWindow = FX_NEW CScript_DataWindow(this);
+ m_pScriptDataWindow = new CScript_DataWindow(this);
}
return m_pScriptDataWindow;
}
case XFA_HASHCODE_Event: {
if (m_pScriptEvent == NULL) {
- m_pScriptEvent = FX_NEW CScript_EventPseudoModel(this);
+ m_pScriptEvent = new CScript_EventPseudoModel(this);
}
return m_pScriptEvent;
}
case XFA_HASHCODE_Host: {
if (m_pScriptHost == NULL) {
- m_pScriptHost = FX_NEW CScript_HostPseudoModel(this);
+ m_pScriptHost = new CScript_HostPseudoModel(this);
}
return m_pScriptHost;
}
case XFA_HASHCODE_Log: {
if (m_pScriptLog == NULL) {
- m_pScriptLog = FX_NEW CScript_LogPseudoModel(this);
+ m_pScriptLog = new CScript_LogPseudoModel(this);
}
return m_pScriptLog;
}
case XFA_HASHCODE_Signature: {
if (m_pScriptSignature == NULL) {
- m_pScriptSignature = FX_NEW CScript_SignaturePseudoModel(this);
+ m_pScriptSignature = new CScript_SignaturePseudoModel(this);
}
return m_pScriptSignature;
}
case XFA_HASHCODE_Layout: {
if (m_pScriptLayout == NULL) {
- m_pScriptLayout = FX_NEW CScript_LayoutPseudoModel(this);
+ m_pScriptLayout = new CScript_LayoutPseudoModel(this);
}
return m_pScriptLayout;
}
@@ -182,7 +182,7 @@ CXFA_Node* CXFA_Document::CreateNode(XFA_LPCPACKETINFO pPacket, }
XFA_LPCELEMENTINFO pElement = XFA_GetElementByID(eElement);
if (pElement && (pElement->dwPackets & pPacket->eName)) {
- CXFA_Node* pNode = FX_NEW CXFA_Node(this, pPacket->eName, pElement->eName);
+ CXFA_Node* pNode = new CXFA_Node(this, pPacket->eName, pElement->eName);
if (pNode) {
AddPurgeNode(pNode);
}
@@ -244,7 +244,7 @@ CXFA_LocaleMgr* CXFA_Document::GetLocalMgr() { if (!m_pLocalMgr) {
CFX_WideString wsLanguage;
this->GetParser()->GetNotify()->GetAppProvider()->GetLanguage(wsLanguage);
- m_pLocalMgr = FX_NEW CXFA_LocaleMgr(
+ m_pLocalMgr = new CXFA_LocaleMgr(
(CXFA_Node*)this->GetXFANode(XFA_HASHCODE_LocaleSet), wsLanguage);
}
return m_pLocalMgr;
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index 22b2f2c48e..77094e3dce 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -25,7 +25,7 @@ #include "xfa_layout_appadapter.h"
CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() {
if (!m_pLayoutProcessor) {
- m_pLayoutProcessor = FX_NEW CXFA_LayoutProcessor(this);
+ m_pLayoutProcessor = new CXFA_LayoutProcessor(this);
ASSERT(m_pLayoutProcessor);
}
return m_pLayoutProcessor;
@@ -65,7 +65,7 @@ int32_t CXFA_LayoutProcessor::StartLayout(FX_BOOL bForceRestart) { return -1;
}
if (!m_pLayoutPageMgr) {
- m_pLayoutPageMgr = FX_NEW CXFA_LayoutPageMgr(this);
+ m_pLayoutPageMgr = new CXFA_LayoutPageMgr(this);
}
if (!m_pLayoutPageMgr->InitLayoutPage(pFormRoot)) {
return -1;
@@ -74,7 +74,7 @@ int32_t CXFA_LayoutProcessor::StartLayout(FX_BOOL bForceRestart) { return -1;
}
m_pRootItemLayoutProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pFormRoot, m_pLayoutPageMgr);
+ new CXFA_ItemLayoutProcessor(pFormRoot, m_pLayoutPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
m_pRootItemLayoutProcessor->m_pPageMgrCreateItem = m_pLayoutPageMgr;
#endif
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index 61be88d11f..f9c3235f7c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -18,7 +18,7 @@ #include "xfa_debug_parser.h"
#include "xfa_document_serialize.h"
IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) {
- return FX_NEW CXFA_DataImporter(pDocument);
+ return new CXFA_DataImporter(pDocument);
}
CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument)
: m_pDocument(pDocument) {
@@ -466,7 +466,7 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, }
IXFA_PacketExport* IXFA_PacketExport::Create(CXFA_Document* pDocument,
XFA_DATAFORMAT eFormat) {
- return FX_NEW CXFA_DataExporter(pDocument);
+ return new CXFA_DataExporter(pDocument);
}
CXFA_DataExporter::CXFA_DataExporter(CXFA_Document* pDocument)
: m_pDocument(pDocument) {
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 93f0b0189d..7cf99b86d7 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -933,7 +933,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutPageArea( continue;
}
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pCurChildNode, NULL);
+ new CXFA_ItemLayoutProcessor(pCurChildNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -1008,7 +1008,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutPositionedContainer( continue;
}
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
+ new CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -1325,7 +1325,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutTableContainer(CXFA_Node* pLayoutNode) { continue;
}
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
+ new CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -1673,7 +1673,7 @@ static FX_FLOAT XFA_ItemLayoutProcessor_InsertPendingItems( pProcessor->m_rgPendingNodes.RemoveAt(pos);
CXFA_ContentLayoutItemImpl* pPendingLayoutItem = NULL;
CXFA_ItemLayoutProcessor* pPendingProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pPendingNode, NULL);
+ new CXFA_ItemLayoutProcessor(pPendingNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pPendingProcessor->m_pPageMgrCreateItem = pProcessor->m_pPageMgrCreateItem;
#endif
@@ -1928,7 +1928,7 @@ static XFA_ItemLayoutProcessorResult XFA_ItemLayoutProcessor_InsertFlowedItem( if (pProcessor->JudgeLeaderOrTrailerForOccur(pOverflowTrailerNode)) {
if (pOverflowTrailerNode) {
CXFA_ItemLayoutProcessor* pOverflowLeaderProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pOverflowTrailerNode, NULL);
+ new CXFA_ItemLayoutProcessor(pOverflowTrailerNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pOverflowLeaderProcessor->m_pPageMgrCreateItem =
pProcessor->m_pPageMgrCreateItem;
@@ -2389,7 +2389,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( TRUE);
} else {
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
+ new CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -2423,7 +2423,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( m_pFormNode->GetClassID() != XFA_ELEMENT_Form) {
if (JudgeLeaderOrTrailerForOccur(pTrailerNode)) {
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
+ new CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -2447,7 +2447,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( fContentCurRowY, fContentCurRowHeight, fContentWidthLimit);
rgCurLineLayoutItems->RemoveAll();
CXFA_ItemLayoutProcessor* pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pLeaderNode, NULL);
+ new CXFA_ItemLayoutProcessor(pLeaderNode, NULL);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -2488,7 +2488,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( m_pPageMgr->ProcessBookendLeaderOrTrailer(
m_pCurChildNode, TRUE, pLeaderNode)) {
pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pLeaderNode, m_pPageMgr);
+ new CXFA_ItemLayoutProcessor(pLeaderNode, m_pPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -2518,7 +2518,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( m_pPageMgr->ProcessBookendLeaderOrTrailer(
m_pCurChildNode, FALSE, pTrailerNode)) {
pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(pTrailerNode, m_pPageMgr);
+ new CXFA_ItemLayoutProcessor(pTrailerNode, m_pPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
@@ -2557,7 +2557,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( bNewRow = TRUE;
} else {
pProcessor =
- FX_NEW CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
+ new CXFA_ItemLayoutProcessor(m_pCurChildNode, m_pPageMgr);
#ifndef _XFA_LAYOUTITEM_ProcessCACHE_
pProcessor->m_pPageMgrCreateItem = m_pPageMgrCreateItem;
#endif
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index ba6d72ebd8..1894480068 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -56,7 +56,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { m_pPageSetLayoutItemRoot->m_pFormNode = m_pTemplatePageSetRoot;
} else {
m_pPageSetLayoutItemRoot =
- FX_NEW CXFA_ContainerLayoutItemImpl(m_pTemplatePageSetRoot);
+ new CXFA_ContainerLayoutItemImpl(m_pTemplatePageSetRoot);
}
m_pPageSetCurRoot = m_pPageSetLayoutItemRoot;
m_pTemplatePageSetRoot->SetUserData(XFA_LAYOUTITEMKEY,
@@ -335,7 +335,7 @@ FX_BOOL XFA_LayoutPageMgr_RunBreakTestScript(CXFA_Node* pTestScript) { CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
CXFA_Node* pPageNode,
FX_BOOL bCreateNew) {
- CXFA_ContainerRecord* pNewRecord = FX_NEW CXFA_ContainerRecord();
+ CXFA_ContainerRecord* pNewRecord = new CXFA_ContainerRecord();
if (m_pCurrentContainerRecord) {
if (!IsPageSetRootOrderedOccurrence() || pPageNode == NULL) {
*pNewRecord = *GetCurrentContainerRecord();
@@ -368,7 +368,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord( ->GetUserData(XFA_LAYOUTITEMKEY);
}
CXFA_ContainerLayoutItemImpl* pPageSetLayoutItem =
- FX_NEW CXFA_ContainerLayoutItemImpl(pPageSet);
+ new CXFA_ContainerLayoutItemImpl(pPageSet);
pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (void*)pPageSetLayoutItem);
if (pParentPageSetLayout == NULL) {
CXFA_ContainerLayoutItemImpl* pPrePageSet = m_pPageSetLayoutItemRoot;
@@ -390,7 +390,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord( pNewRecord->pCurPageSet = m_pPageSetLayoutItemRoot;
} else {
CXFA_ContainerLayoutItemImpl* pPageSetLayoutItem =
- FX_NEW CXFA_ContainerLayoutItemImpl(pPageSet);
+ new CXFA_ContainerLayoutItemImpl(pPageSet);
pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (void*)pPageSetLayoutItem);
m_pPageSetLayoutItemRoot->AddChild(pPageSetLayoutItem);
pNewRecord->pCurPageSet = pPageSetLayoutItem;
@@ -435,7 +435,7 @@ void CXFA_LayoutPageMgr::AddContentAreaLayoutItem( return;
}
CXFA_ContainerLayoutItemImpl* pNewContentAreaLayoutItem =
- FX_NEW CXFA_ContainerLayoutItemImpl(pContentArea);
+ new CXFA_ContainerLayoutItemImpl(pContentArea);
ASSERT(pNewRecord->pCurPageArea);
pNewRecord->pCurPageArea->AddChild(pNewContentAreaLayoutItem);
pNewRecord->pCurContentArea = pNewContentAreaLayoutItem;
diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index ad8e822542..62310f5845 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -1056,7 +1056,7 @@ static IFX_Locale* XFA_GetLocaleFromBuffer(const uint8_t* pBuf, int nBufLen) { FX_Free(pOut);
}
if (pLocale) {
- return FX_NEW CXFA_XMLLocale(pLocale);
+ return new CXFA_XMLLocale(pLocale);
}
return NULL;
}
@@ -1128,7 +1128,7 @@ CXFA_LocaleMgr::CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid) if (pLocaleSet &&
(pNodeLocale = pLocaleSet->GetNodeItem(XFA_NODEITEM_FirstChild))) {
while (pNodeLocale) {
- m_LocaleArray.Add(FX_NEW CXFA_NodeLocale(pNodeLocale));
+ m_LocaleArray.Add(new CXFA_NodeLocale(pNodeLocale));
pNodeLocale = pNodeLocale->GetNodeItem(XFA_NODEITEM_NextSibling);
}
}
@@ -1273,12 +1273,12 @@ CFX_WideStringC CXFA_LocaleMgr::GetConfigLocaleName(CXFA_Node* pConfig) { static CXFA_TimeZoneProvider* g_pProvider = NULL;
IXFA_TimeZoneProvider* IXFA_TimeZoneProvider::Create() {
FXSYS_assert(!g_pProvider);
- g_pProvider = FX_NEW CXFA_TimeZoneProvider();
+ g_pProvider = new CXFA_TimeZoneProvider();
return g_pProvider;
}
IXFA_TimeZoneProvider* IXFA_TimeZoneProvider::Get() {
if (!g_pProvider) {
- g_pProvider = FX_NEW CXFA_TimeZoneProvider();
+ g_pProvider = new CXFA_TimeZoneProvider();
}
return g_pProvider;
}
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index efa3d982c7..a6527db6f5 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -75,7 +75,7 @@ static void XFA_DeleteWideString(void* pData) { }
static void XFA_CopyWideString(void*& pData) {
if (pData) {
- CFX_WideString* pNewData = FX_NEW CFX_WideString(*(CFX_WideString*)pData);
+ CFX_WideString* pNewData = new CFX_WideString(*(CFX_WideString*)pData);
pData = pNewData;
}
}
@@ -372,7 +372,7 @@ int32_t CXFA_Node::AddBindItem(CXFA_Node* pFormNode) { } else if (pOldFormItem == pFormNode) {
return 1;
}
- CXFA_NodeArray* pItems = FX_NEW CXFA_NodeArray;
+ CXFA_NodeArray* pItems = new CXFA_NodeArray;
SetObject(XFA_ATTRIBUTE_BindingNode, pItems, &deleteBindItemCallBack);
pItems->Add(pOldFormItem);
pItems->Add(pFormNode);
@@ -695,7 +695,7 @@ void CXFA_Node::Script_Som_ResolveNodeList(FXJSE_HVALUE hValue, }
int32_t iRet = pScriptContext->ResolveObjects(refNode, wsExpression,
resoveNodeRS, dwFlag);
- CXFA_ArrayNodeList* pNodeList = FX_NEW CXFA_ArrayNodeList(m_pDocument);
+ CXFA_ArrayNodeList* pNodeList = new CXFA_ArrayNodeList(m_pDocument);
if (resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
for (int32_t i = 0; i < resoveNodeRS.nodes.GetSize(); i++) {
if (resoveNodeRS.nodes[i]->IsNode()) {
@@ -746,7 +746,7 @@ void CXFA_Node::Script_TreeClass_Nodes(FXJSE_HVALUE hValue, FX_UTF8Encode(wsMessage, wsMessage.GetLength()));
} else {
CXFA_AttachNodeList* pNodeList =
- FX_NEW CXFA_AttachNodeList(m_pDocument, this);
+ new CXFA_AttachNodeList(m_pDocument, this);
FXJSE_Value_SetObject(hValue, (CXFA_Object*)pNodeList,
pScriptContext->GetJseNormalClass());
}
@@ -1234,7 +1234,7 @@ void CXFA_Node::Script_NodeClass_OneOfChild(FXJSE_HVALUE hValue, }
void CXFA_Node::Script_ContainerClass_GetDelta(CFXJSE_Arguments* pArguments) {}
void CXFA_Node::Script_ContainerClass_GetDeltas(CFXJSE_Arguments* pArguments) {
- CXFA_ArrayNodeList* pFormNodes = FX_NEW CXFA_ArrayNodeList(m_pDocument);
+ CXFA_ArrayNodeList* pFormNodes = new CXFA_ArrayNodeList(m_pDocument);
FXJSE_Value_SetObject(pArguments->GetReturnValue(), (CXFA_Object*)pFormNodes,
m_pDocument->GetScriptContext()->GetJseNormalClass());
}
@@ -2916,12 +2916,12 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1, rgNodeListMap[pParentNode];
if (!pNodeListChildMap) {
rgNodeListMap[pParentNode] = pNodeListChildMap =
- FX_NEW CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
+ new CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
}
CXFA_DualNodeArray* pDualNodeArray = (*pNodeListChildMap)[dwNameHash];
if (!pDualNodeArray) {
(*pNodeListChildMap)[dwNameHash] = pDualNodeArray =
- FX_NEW CXFA_DualNodeArray;
+ new CXFA_DualNodeArray;
}
pDualNodeArray->firstNodeList.Add(pNode);
}
@@ -2938,12 +2938,12 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1, rgNodeListMap[pParentNode];
if (!pNodeListChildMap) {
rgNodeListMap[pParentNode] = pNodeListChildMap =
- FX_NEW CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
+ new CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
}
CXFA_DualNodeArray* pDualNodeArray = (*pNodeListChildMap)[dwNameHash];
if (!pDualNodeArray) {
(*pNodeListChildMap)[dwNameHash] = pDualNodeArray =
- FX_NEW CXFA_DualNodeArray;
+ new CXFA_DualNodeArray;
}
if (pDualNodeArray->firstNodeList.Lookup(pNode)) {
pDualNodeArray->firstNodeList.RemoveKey(pNode);
@@ -3419,7 +3419,7 @@ void CXFA_Node::Script_Form_FormNodes(CFXJSE_Arguments* pArguments) { if (pDataNode) {
CXFA_NodeArray formItems;
int32_t iSize = pDataNode->GetBindItems(formItems);
- CXFA_ArrayNodeList* pFormNodes = FX_NEW CXFA_ArrayNodeList(m_pDocument);
+ CXFA_ArrayNodeList* pFormNodes = new CXFA_ArrayNodeList(m_pDocument);
pFormNodes->SetArrayNodeList(formItems);
FXJSE_Value_SetObject(
pArguments->GetReturnValue(), (CXFA_Object*)pFormNodes,
@@ -3977,7 +3977,7 @@ FX_BOOL CXFA_Node::SetCData(XFA_ATTRIBUTE eAttr, }
OnChanging(eAttr, (void*)(const FX_WCHAR*)wsValue, bNotify);
if (eAttr == XFA_ATTRIBUTE_Value) {
- CFX_WideString* pClone = FX_NEW CFX_WideString(wsValue);
+ CFX_WideString* pClone = new CFX_WideString(wsValue);
if (pClone == NULL) {
return FALSE;
}
@@ -4056,7 +4056,7 @@ FX_BOOL CXFA_Node::SetAttributeValue(const CFX_WideString& wsValue, return FALSE;
}
OnChanging(XFA_ATTRIBUTE_Value, (void*)(const FX_WCHAR*)wsValue, bNotify);
- CFX_WideString* pClone = FX_NEW CFX_WideString(wsValue);
+ CFX_WideString* pClone = new CFX_WideString(wsValue);
if (pClone == NULL) {
return FALSE;
}
@@ -5048,7 +5048,7 @@ FX_BOOL CXFA_Node::IsNeedSavingXMLNode() { }
XFA_LPMAPMODULEDATA CXFA_Node::GetMapModuleData(FX_BOOL bCreateNew) {
if (!m_pMapModuleData && bCreateNew) {
- m_pMapModuleData = FX_NEW XFA_MAPMODULEDATA;
+ m_pMapModuleData = new XFA_MAPMODULEDATA;
}
return m_pMapModuleData;
}
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 2a01302d8a..6f97305d1a 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -20,7 +20,7 @@ #include "xfa_parser_imp.h"
IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory,
FX_BOOL bDocumentParser) {
- return FX_NEW CXFA_SimpleParser(pFactory, bDocumentParser);
+ return new CXFA_SimpleParser(pFactory, bDocumentParser);
}
CXFA_SimpleParser::CXFA_SimpleParser(IXFA_ObjFactory* pFactory,
FX_BOOL bDocumentParser)
@@ -81,7 +81,7 @@ int32_t CXFA_SimpleParser::StartParse(IFX_FileRead* pStream, if (m_pXMLDoc == NULL) {
return XFA_PARSESTATUS_StatusErr;
}
- m_pXMLParser = FX_NEW CXFA_XMLParser(m_pXMLDoc->GetRoot(), m_pStream);
+ m_pXMLParser = new CXFA_XMLParser(m_pXMLDoc->GetRoot(), m_pStream);
if (m_pXMLParser == NULL) {
return XFA_PARSESTATUS_StatusErr;
}
@@ -129,7 +129,7 @@ int32_t CXFA_SimpleParser::ParseXMLData(const CFX_WideString& wsXML, return XFA_PARSESTATUS_StatusErr;
}
CXFA_XMLParser* pParser =
- FX_NEW CXFA_XMLParser(m_pXMLDoc->GetRoot(), m_pStream);
+ new CXFA_XMLParser(m_pXMLDoc->GetRoot(), m_pStream);
if (pParser == NULL) {
return XFA_PARSESTATUS_StatusErr;
}
@@ -1378,7 +1378,7 @@ void CXFA_SimpleParser::CloseParser() { }
}
IXFA_DocParser* IXFA_DocParser::Create(IXFA_Notify* pNotify) {
- return FX_NEW CXFA_DocumentParser(pNotify);
+ return new CXFA_DocumentParser(pNotify);
}
CXFA_DocumentParser::CXFA_DocumentParser(IXFA_Notify* pNotify)
: m_pNotify(pNotify), m_nodeParser(NULL, TRUE), m_pDocument(NULL) {}
@@ -1390,7 +1390,7 @@ int32_t CXFA_DocumentParser::StartParse(IFX_FileRead* pStream, CloseParser();
int32_t nRetStatus = m_nodeParser.StartParse(pStream, ePacketID);
if (nRetStatus == XFA_PARSESTATUS_Ready) {
- m_pDocument = FX_NEW CXFA_Document(this);
+ m_pDocument = new CXFA_Document(this);
m_nodeParser.SetFactory(m_pDocument);
}
return nRetStatus;
@@ -1409,7 +1409,7 @@ int32_t CXFA_DocumentParser::ParseXMLData(const CFX_WideString& wsXML, CloseParser();
int32_t nRetStatus = m_nodeParser.ParseXMLData(wsXML, pXMLNode, NULL);
if (nRetStatus == XFA_PARSESTATUS_Done && pXMLNode) {
- m_pDocument = FX_NEW CXFA_Document(this);
+ m_pDocument = new CXFA_Document(this);
m_nodeParser.SetFactory(m_pDocument);
}
return nRetStatus;
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index a0bc1f54b2..f8b8f76ae9 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -79,7 +79,7 @@ void CXFA_ScriptContext::Initialize(FXJSE_HRUNTIME hRuntime) { m_hJsRuntime = hRuntime;
DefineJsContext();
DefineJsClass();
- m_pResolveProcessor = FX_NEW CXFA_ResolveProcessor;
+ m_pResolveProcessor = new CXFA_ResolveProcessor;
}
void CXFA_ScriptContext::Release() {
delete this;
@@ -460,7 +460,7 @@ FXJSE_HCONTEXT CXFA_ScriptContext::CreateVariablesContext( m_JsGlobalVariablesClass.dynMethodCall =
CXFA_ScriptContext::NormalMethodCall;
}
- CXFA_ThisProxy* lpVariableNode = FX_NEW CXFA_ThisProxy(pSubform, pScriptNode);
+ CXFA_ThisProxy* lpVariableNode = new CXFA_ThisProxy(pSubform, pScriptNode);
FXJSE_HCONTEXT hVariablesContext = FXJSE_Context_Create(
m_hJsRuntime, &m_JsGlobalVariablesClass, (CXFA_Object*)lpVariableNode);
FXJSE_Context_EnableCompatibleMode(
@@ -824,7 +824,7 @@ void CXFA_ScriptContext::AddNodesOfRunScript(CXFA_Node* pNode) { }
}
IXFA_ScriptContext* XFA_ScriptContext_Create(CXFA_Document* pDocument) {
- return FX_NEW CXFA_ScriptContext(pDocument);
+ return new CXFA_ScriptContext(pDocument);
}
static const XFA_JSBUILTININFO gs_JSBUILTINData[] = {
{0x8108b9a9, "Number"},
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index 49efa3b8f6..14c8f2d409 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -381,7 +381,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_PageContent( CXFA_NodeArray retArray;
Script_LayoutPseudoModel_GetObjArray(pDocLayout, iIndex, wsType, bOnPageArea,
retArray);
- CXFA_ArrayNodeList* pArrayNodeList = FX_NEW CXFA_ArrayNodeList(m_pDocument);
+ CXFA_ArrayNodeList* pArrayNodeList = new CXFA_ArrayNodeList(m_pDocument);
pArrayNodeList->SetArrayNodeList(retArray);
FXJSE_Value_SetObject(pArguments->GetReturnValue(),
(CXFA_Object*)pArrayNodeList,
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index 6b61c535b0..dfbf22d7dc 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -21,7 +21,7 @@ #include "xfa_script_imp.h"
CXFA_ResolveProcessor::CXFA_ResolveProcessor(void)
: m_pNodeHelper(NULL), m_iCurStart(0) {
- m_pNodeHelper = FX_NEW CXFA_NodeHelper;
+ m_pNodeHelper = new CXFA_NodeHelper;
}
CXFA_ResolveProcessor::~CXFA_ResolveProcessor(void) {
if (m_pNodeHelper) {
|