From ae51c810a44844ef437393c1768be8f7766586b2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 5 Aug 2015 12:34:06 -0700 Subject: Kill off last uses of FX_NEW in XFA. It would seem that this never merged completely. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1277583002 . --- xfa/src/fxfa/src/app/xfa_checksum.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffapp.cpp | 16 +-- xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 6 +- xfa/src/fxfa/src/app/xfa_ffdocview.cpp | 10 +- xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffnotify.cpp | 46 ++++---- xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 8 +- xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp | 8 +- xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 24 ++-- xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 22 ++-- xfa/src/fxfa/src/app/xfa_rendercontext.cpp | 2 +- xfa/src/fxfa/src/app/xfa_textlayout.cpp | 8 +- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp | 2 +- xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp | 122 ++++++++++----------- xfa/src/fxfa/src/fm2js/xfa_lexer.cpp | 2 +- xfa/src/fxfa/src/fm2js/xfa_program.cpp | 2 +- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 2 +- .../src/parser/xfa_document_datamerger_imp.cpp | 2 +- xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 16 +-- .../fxfa/src/parser/xfa_document_layout_imp.cpp | 6 +- xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 4 +- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 22 ++-- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 10 +- xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 8 +- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 26 ++--- xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 12 +- xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 6 +- .../src/parser/xfa_script_layoutpseudomodel.cpp | 2 +- .../src/parser/xfa_script_resolveprocessor.cpp | 2 +- 31 files changed, 204 insertions(+), 204 deletions(-) (limited to 'xfa/src/fxfa') diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index c4f0e15595..f0bc8cf53b 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -134,7 +134,7 @@ void CXFA_SAXReaderHandler::UpdateChecksum(FX_BOOL bCheckSpace) { m_SAXContext.m_TextBuf.Clear(); } IXFA_ChecksumContext* XFA_Checksum_Create() { - return FX_NEW CXFA_ChecksumContext; + return new CXFA_ChecksumContext; } CXFA_ChecksumContext::CXFA_ChecksumContext() : m_pSAXReader(NULL), m_pByteContext(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index b303fbd3f3..14c59e93f0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -196,20 +196,20 @@ CXFA_FFApp::~CXFA_FFApp() { } IXFA_MenuHandler* CXFA_FFApp::GetMenuHandler() { if (!m_pMenuHandler) { - m_pMenuHandler = FX_NEW CXFA_FFMenuHandler; + m_pMenuHandler = new CXFA_FFMenuHandler; } return m_pMenuHandler; } IXFA_DocHandler* CXFA_FFApp::GetDocHandler() { if (!m_pDocHandler) { - m_pDocHandler = FX_NEW CXFA_FFDocHandler; + m_pDocHandler = new CXFA_FFDocHandler; } return m_pDocHandler; } IXFA_Doc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider, IFX_FileRead* pStream, FX_BOOL bTakeOverFile) { - CXFA_FFDoc* pDoc = FX_NEW CXFA_FFDoc(this, pProvider); + CXFA_FFDoc* pDoc = new CXFA_FFDoc(this, pProvider); if (!pDoc) { return NULL; } @@ -225,7 +225,7 @@ IXFA_Doc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider, if (pPDFDoc == NULL) { return NULL; } - CXFA_FFDoc* pDoc = FX_NEW CXFA_FFDoc(this, pProvider); + CXFA_FFDoc* pDoc = new CXFA_FFDoc(this, pProvider); if (!pDoc) { return NULL; } @@ -239,7 +239,7 @@ IXFA_Doc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider, void CXFA_FFApp::SetDefaultFontMgr(IXFA_FontMgr* pFontMgr) { if (!m_pFontMgr) { - m_pFontMgr = FX_NEW CXFA_FontMgr(); + m_pFontMgr = new CXFA_FontMgr(); } m_pFontMgr->SetDefFontMgr(pFontMgr); } @@ -259,14 +259,14 @@ IFX_FontMgr* CXFA_FFApp::GetFDEFontMgr() { } CXFA_FWLTheme* CXFA_FFApp::GetFWLTheme() { if (!m_pFWLTheme) { - m_pFWLTheme = FX_NEW CXFA_FWLTheme(this); + m_pFWLTheme = new CXFA_FWLTheme(this); } return m_pFWLTheme; } IFWL_AdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr( IFWL_WidgetMgrDelegate* pDelegate) { if (!m_pAdapterWidgetMgr) { - m_pAdapterWidgetMgr = FX_NEW CXFA_FWLAdapterWidgetMgr; + m_pAdapterWidgetMgr = new CXFA_FWLAdapterWidgetMgr; pDelegate->OnSetCapability(FWL_WGTMGR_DisableThread | FWL_WGTMGR_DisableForm); m_pWidgetMgrDelegate = pDelegate; @@ -275,7 +275,7 @@ IFWL_AdapterWidgetMgr* CXFA_FFApp::GetWidgetMgr( } IFWL_AdapterThreadMgr* CXFA_FFApp::GetThreadMgr() { if (!m_pAdapterThreadMgr) { - m_pAdapterThreadMgr = FX_NEW CFWL_SDAdapterThreadMgr; + m_pAdapterThreadMgr = new CFWL_SDAdapterThreadMgr; } return m_pAdapterThreadMgr; } diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index dc60e84dc0..7846bdafcd 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -28,7 +28,7 @@ FX_DWORD CXFA_FFDoc::GetDocType() { return m_dwDocType; } int32_t CXFA_FFDoc::StartLoad() { - m_pNotify = FX_NEW CXFA_FFNotify(this); + m_pNotify = new CXFA_FFNotify(this); IXFA_DocParser* pDocParser = IXFA_DocParser::Create(m_pNotify); int32_t iStatus = pDocParser->StartParse(m_pStream); m_pDocument = pDocParser->GetDocument(); @@ -187,7 +187,7 @@ IXFA_DocView* CXFA_FFDoc::CreateDocView(FX_DWORD dwView) { CXFA_FFDocView* pDocView = (CXFA_FFDocView*)m_mapTypeToDocView.GetValueAt((void*)(uintptr_t)dwView); if (!pDocView) { - pDocView = FX_NEW CXFA_FFDocView(this); + pDocView = new CXFA_FFDocView(this); m_mapTypeToDocView.SetAt((void*)(uintptr_t)dwView, pDocView); } return pDocView; @@ -252,7 +252,7 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) { if (xfaStreams.GetSize() < 1) { return FALSE; } - IFX_FileRead* pFileRead = FX_NEW CXFA_FileRead2(xfaStreams); + IFX_FileRead* pFileRead = new CXFA_FileRead2(xfaStreams); if (!pFileRead) { return FALSE; } diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index dc444d2dba..8585f6b7e9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -313,7 +313,7 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam, } IXFA_WidgetHandler* CXFA_FFDocView::GetWidgetHandler() { if (!m_pWidgetHandler) { - m_pWidgetHandler = FX_NEW CXFA_FFWidgetHandler(this); + m_pWidgetHandler = new CXFA_FFWidgetHandler(this); } return m_pWidgetHandler; } @@ -322,7 +322,7 @@ IXFA_WidgetIterator* CXFA_FFDocView::CreateWidgetIterator() { if (!pFormRoot) { return NULL; } - return FX_NEW CXFA_FFDocWidgetIterator(this, pFormRoot); + return new CXFA_FFDocWidgetIterator(this, pFormRoot); } IXFA_WidgetAccIterator* CXFA_FFDocView::CreateWidgetAccIterator( XFA_WIDGETORDER eOrder) { @@ -330,7 +330,7 @@ IXFA_WidgetAccIterator* CXFA_FFDocView::CreateWidgetAccIterator( if (!pFormRoot) { return NULL; } - return FX_NEW CXFA_WidgetAccIterator(this, pFormRoot); + return new CXFA_WidgetAccIterator(this, pFormRoot); } IXFA_Widget* CXFA_FFDocView::GetFocusWidget() { return m_pFocusWidget; @@ -575,7 +575,7 @@ void CXFA_FFDocView::AddInvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rtInvalidate) { CFX_RectF* pRect = (CFX_RectF*)m_mapPageInvalidate.GetValueAt(pPageView); if (!pRect) { - pRect = FX_NEW CFX_RectF; + pRect = new CFX_RectF; pRect->Set(rtInvalidate.left, rtInvalidate.top, rtInvalidate.width, rtInvalidate.height); m_mapPageInvalidate.SetAt(pPageView, pRect); @@ -890,7 +890,7 @@ IXFA_WidgetAccIterator* XFA_WidgetAccIterator_Create( if (!pTravelRoot) { return NULL; } - return FX_NEW CXFA_WidgetAccIterator(pTravelRoot->GetDocView(), + return new CXFA_WidgetAccIterator(pTravelRoot->GetDocView(), pTravelRoot->GetNode()); } CXFA_WidgetAccIterator::CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 6a45a9f0de..b22a00dd83 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -19,7 +19,7 @@ CXFA_FFImageEdit::~CXFA_FFImageEdit() { CXFA_FFImageEdit::UnloadWidget(); } FX_BOOL CXFA_FFImageEdit::LoadWidget() { - CFWL_PictureBox* pPictureBox = FX_NEW CFWL_PictureBox; + CFWL_PictureBox* pPictureBox = new CFWL_PictureBox; if (pPictureBox) { pPictureBox->Initialize(); } diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index 0ec91929fe..24b72f8e23 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -150,74 +150,74 @@ CXFA_LayoutItem* CXFA_FFNotify::OnCreateLayoutItem(CXFA_Node* pNode) { CXFA_FFDocView* pDocView = m_pDoc->GetDocView(pLayout); XFA_ELEMENT eType = pNode->GetClassID(); if (eType == XFA_ELEMENT_PageArea) { - return (CXFA_LayoutItem*)(FX_NEW CXFA_FFPageView(pDocView, pNode)); + return (CXFA_LayoutItem*)(new CXFA_FFPageView(pDocView, pNode)); } else if (eType == XFA_ELEMENT_ContentArea) { - return (CXFA_LayoutItem*)(FX_NEW CXFA_ContainerLayoutItemImpl(pNode)); + return (CXFA_LayoutItem*)(new CXFA_ContainerLayoutItemImpl(pNode)); } CXFA_WidgetAcc* pAcc = (CXFA_WidgetAcc*)pNode->GetWidgetData(); if (!pAcc) { - return (CXFA_LayoutItem*)(FX_NEW CXFA_ContentLayoutItemImpl(pNode)); + return (CXFA_LayoutItem*)(new CXFA_ContentLayoutItemImpl(pNode)); } CXFA_FFPageView* pPageView = NULL; CXFA_FFWidget* pWidget = NULL; switch (pAcc->GetUIType()) { case XFA_ELEMENT_Barcode: - pWidget = FX_NEW CXFA_FFBarcode(pPageView, pAcc); + pWidget = new CXFA_FFBarcode(pPageView, pAcc); break; case XFA_ELEMENT_Button: - pWidget = FX_NEW CXFA_FFPushButton(pPageView, pAcc); + pWidget = new CXFA_FFPushButton(pPageView, pAcc); break; case XFA_ELEMENT_CheckButton: - pWidget = FX_NEW CXFA_FFCheckButton(pPageView, pAcc); + pWidget = new CXFA_FFCheckButton(pPageView, pAcc); break; case XFA_ELEMENT_ChoiceList: { if (pAcc->IsListBox()) { - pWidget = FX_NEW CXFA_FFListBox(pPageView, pAcc); + pWidget = new CXFA_FFListBox(pPageView, pAcc); } else { - pWidget = FX_NEW CXFA_FFComboBox(pPageView, pAcc); + pWidget = new CXFA_FFComboBox(pPageView, pAcc); } } break; case XFA_ELEMENT_DateTimeEdit: - pWidget = FX_NEW CXFA_FFDateTimeEdit(pPageView, pAcc); + pWidget = new CXFA_FFDateTimeEdit(pPageView, pAcc); break; case XFA_ELEMENT_ImageEdit: - pWidget = FX_NEW CXFA_FFImageEdit(pPageView, pAcc); + pWidget = new CXFA_FFImageEdit(pPageView, pAcc); break; case XFA_ELEMENT_NumericEdit: - pWidget = FX_NEW CXFA_FFNumericEdit(pPageView, pAcc); + pWidget = new CXFA_FFNumericEdit(pPageView, pAcc); break; case XFA_ELEMENT_PasswordEdit: - pWidget = FX_NEW CXFA_FFPasswordEdit(pPageView, pAcc); + pWidget = new CXFA_FFPasswordEdit(pPageView, pAcc); break; case XFA_ELEMENT_Signature: - pWidget = FX_NEW CXFA_FFSignature(pPageView, pAcc); + pWidget = new CXFA_FFSignature(pPageView, pAcc); break; case XFA_ELEMENT_TextEdit: - pWidget = FX_NEW CXFA_FFTextEdit(pPageView, pAcc); + pWidget = new CXFA_FFTextEdit(pPageView, pAcc); break; case XFA_ELEMENT_Arc: - pWidget = FX_NEW CXFA_FFArc(pPageView, pAcc); + pWidget = new CXFA_FFArc(pPageView, pAcc); break; case XFA_ELEMENT_Line: - pWidget = FX_NEW CXFA_FFLine(pPageView, pAcc); + pWidget = new CXFA_FFLine(pPageView, pAcc); break; case XFA_ELEMENT_Rectangle: - pWidget = FX_NEW CXFA_FFRectangle(pPageView, pAcc); + pWidget = new CXFA_FFRectangle(pPageView, pAcc); break; case XFA_ELEMENT_Text: - pWidget = FX_NEW CXFA_FFText(pPageView, pAcc); + pWidget = new CXFA_FFText(pPageView, pAcc); break; case XFA_ELEMENT_Image: - pWidget = FX_NEW CXFA_FFImage(pPageView, pAcc); + pWidget = new CXFA_FFImage(pPageView, pAcc); break; case XFA_ELEMENT_Draw: - pWidget = FX_NEW CXFA_FFDraw(pPageView, pAcc); + pWidget = new CXFA_FFDraw(pPageView, pAcc); break; case XFA_ELEMENT_Subform: - pWidget = FX_NEW CXFA_FFSubForm(pPageView, pAcc); + pWidget = new CXFA_FFSubForm(pPageView, pAcc); break; case XFA_ELEMENT_ExclGroup: - pWidget = FX_NEW CXFA_FFExclGroup(pPageView, pAcc); + pWidget = new CXFA_FFExclGroup(pPageView, pAcc); break; case XFA_ELEMENT_DefaultUi: default: @@ -402,7 +402,7 @@ void CXFA_FFNotify::OnNodeReady(CXFA_Node* pNode) { } XFA_ELEMENT iType = pNode->GetClassID(); if (XFA_IsCreateWidget(iType)) { - CXFA_WidgetAcc* pAcc = FX_NEW CXFA_WidgetAcc(pDocView, (CXFA_Node*)pNode); + CXFA_WidgetAcc* pAcc = new CXFA_WidgetAcc(pDocView, (CXFA_Node*)pNode); pNode->SetObject(XFA_ATTRIBUTE_WidgetData, pAcc, &gs_XFADeleteWidgetAcc); return; } diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index b3984ef014..2e65028956 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -88,9 +88,9 @@ IXFA_WidgetIterator* CXFA_FFPageView::CreateWidgetIterator( FX_DWORD dwWidgetFilter) { switch (dwTraverseWay) { case XFA_TRAVERSEWAY_Tranvalse: - return FX_NEW CXFA_FFTabOrderPageWidgetIterator(this, dwWidgetFilter); + return new CXFA_FFTabOrderPageWidgetIterator(this, dwWidgetFilter); case XFA_TRAVERSEWAY_Form: - return FX_NEW CXFA_FFPageWidgetIterator(this, dwWidgetFilter); + return new CXFA_FFPageWidgetIterator(this, dwWidgetFilter); } return NULL; } @@ -363,7 +363,7 @@ void CXFA_FFTabOrderPageWidgetIterator::OrderContainer( bCurrentItem = TRUE; break; } - CXFA_TabParam* pParam = FX_NEW CXFA_TabParam; + CXFA_TabParam* pParam = new CXFA_TabParam; pParam->m_pWidget = hWidget; tabParams.Add(pParam); if (XFA_IsLayoutElement(pSearchItem->GetFormNode()->GetClassID(), TRUE)) { @@ -397,7 +397,7 @@ void CXFA_FFTabOrderPageWidgetIterator::CreateSpaceOrderWidgetArray( CXFA_WidgetArray& WidgetArray) { CXFA_LayoutItemIterator sIterator; sIterator.Init((CXFA_LayoutItem*)m_pPageView->GetLayoutPage()); - CXFA_TabParam* pParam = FX_NEW CXFA_TabParam; + CXFA_TabParam* pParam = new CXFA_TabParam; FX_BOOL bCurrentItem = FALSE; FX_BOOL bContentArea = FALSE; OrderContainer(&sIterator, NULL, pParam, bCurrentItem, bContentArea); diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index f5047144fe..29f7bd6630 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -144,18 +144,18 @@ void CXFA_FFPushButton::LoadHighlightCaption() { FX_BOOL bRichText; if (m_pDataAcc->GetButtonRollover(wsRollover, bRichText)) { if (m_pRollProvider == NULL) { - m_pRollProvider = FX_NEW CXFA_TextProvider( + m_pRollProvider = new CXFA_TextProvider( m_pDataAcc, XFA_TEXTPROVIDERTYPE_Rollover); } - m_pRolloverTextLayout = FX_NEW CXFA_TextLayout(m_pRollProvider); + m_pRolloverTextLayout = new CXFA_TextLayout(m_pRollProvider); } CFX_WideString wsDown; if (m_pDataAcc->GetButtonDown(wsDown, bRichText)) { if (m_pDownProvider == NULL) { m_pDownProvider = - FX_NEW CXFA_TextProvider(m_pDataAcc, XFA_TEXTPROVIDERTYPE_Down); + new CXFA_TextProvider(m_pDataAcc, XFA_TEXTPROVIDERTYPE_Down); } - m_pDownTextLayout = FX_NEW CXFA_TextLayout(m_pDownProvider); + m_pDownTextLayout = new CXFA_TextLayout(m_pDownProvider); } } } diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 2b6e1dac4b..ed35d3e0ba 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -580,7 +580,7 @@ FX_BOOL CXFA_ImageRenderer::StartDIBSource() { FX_RECT clip_box = m_pDevice->GetClipBox(); clip_box.Intersect(image_rect); m_Status = 2; - m_pTransformer = FX_NEW CFX_ImageTransformer; + m_pTransformer = new CFX_ImageTransformer; m_pTransformer->Start(pDib, &m_ImageMatrix, m_Flags, &clip_box); return TRUE; } @@ -1076,7 +1076,7 @@ CFX_DIBitmap* XFA_LoadImageFromBuffer(IFX_FileRead* pImageFileRead, int32_t iComponents = pProgressiveDecoder->GetNumComponents(); int32_t iBpc = pProgressiveDecoder->GetBPC(); FXDIB_Format dibFormat = XFA_GetDIBFormat(type, iComponents, iBpc); - pBitmap = FX_NEW CFX_DIBitmap(); + pBitmap = new CFX_DIBitmap(); pBitmap->Create(pProgressiveDecoder->GetWidth(), pProgressiveDecoder->GetHeight(), dibFormat); pBitmap->Clear(0xffffffff); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index cd1ecaec3e..6185ade383 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -49,8 +49,8 @@ class CXFA_TextLayoutData : public CXFA_WidgetLayoutData { if (m_pTextLayout) { return TRUE; } - m_pTextProvider = FX_NEW CXFA_TextProvider(pAcc, XFA_TEXTPROVIDERTYPE_Text); - m_pTextLayout = FX_NEW CXFA_TextLayout(m_pTextProvider); + m_pTextProvider = new CXFA_TextProvider(pAcc, XFA_TEXTPROVIDERTYPE_Text); + m_pTextLayout = new CXFA_TextLayout(m_pTextProvider); return m_pTextLayout != NULL; } CXFA_TextLayout* m_pTextLayout; @@ -128,8 +128,8 @@ class CXFA_FieldLayoutData : public CXFA_WidgetLayoutData { if (caption.IsExistInXML() && caption.GetPresence() != XFA_ATTRIBUTEENUM_Hidden) { m_pCapTextProvider = - FX_NEW CXFA_TextProvider(pAcc, XFA_TEXTPROVIDERTYPE_Caption); - m_pCapTextLayout = FX_NEW CXFA_TextLayout(m_pCapTextProvider); + new CXFA_TextProvider(pAcc, XFA_TEXTPROVIDERTYPE_Caption); + m_pCapTextLayout = new CXFA_TextLayout(m_pCapTextProvider); return m_pCapTextLayout != NULL; } return FALSE; @@ -693,7 +693,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, CXFA_CalcData* pGlobalData = (CXFA_CalcData*)pRefNode->GetUserData(XFA_CalcData); if (!pGlobalData) { - pGlobalData = FX_NEW CXFA_CalcData; + pGlobalData = new CXFA_CalcData; pRefNode->SetUserData(XFA_CalcData, pGlobalData, &gs_XFADeleteCalcData); } @@ -1272,7 +1272,7 @@ FX_BOOL CXFA_WidgetAcc::FindSplitPos(int32_t iBlockIndex, } if (!((CXFA_FieldLayoutData*)m_pLayoutData)->m_pFieldSplitArray) { ((CXFA_FieldLayoutData*)m_pLayoutData)->m_pFieldSplitArray = - FX_NEW CFX_FloatArray; + new CFX_FloatArray; } CFX_FloatArray* pFieldArray = ((CXFA_FieldLayoutData*)m_pLayoutData)->m_pFieldSplitArray; @@ -1424,24 +1424,24 @@ void CXFA_WidgetAcc::InitLayoutData() { } switch (GetUIType()) { case XFA_ELEMENT_Text: - m_pLayoutData = FX_NEW CXFA_TextLayoutData; + m_pLayoutData = new CXFA_TextLayoutData; return; case XFA_ELEMENT_TextEdit: - m_pLayoutData = FX_NEW CXFA_TextEditData; + m_pLayoutData = new CXFA_TextEditData; return; case XFA_ELEMENT_Image: - m_pLayoutData = FX_NEW CXFA_ImageLayoutData; + m_pLayoutData = new CXFA_ImageLayoutData; return; case XFA_ELEMENT_ImageEdit: - m_pLayoutData = FX_NEW CXFA_ImageEditData; + m_pLayoutData = new CXFA_ImageEditData; return; default: break; } if (GetClassID() == XFA_ELEMENT_Field) { - m_pLayoutData = FX_NEW CXFA_FieldLayoutData; + m_pLayoutData = new CXFA_FieldLayoutData; } else { - m_pLayoutData = FX_NEW CXFA_WidgetLayoutData; + m_pLayoutData = new CXFA_WidgetLayoutData; } } void CXFA_WidgetAcc::StartTextLayout(FX_FLOAT& fCalcWidth, diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 2eba7649ee..23a1b29c01 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -1746,7 +1746,7 @@ const XFA_FONTINFO* XFA_GetFontINFOByFontName( } // static IXFA_FontMgr* IXFA_FontMgr::CreateDefault() { - return FX_NEW CXFA_DefFontMgr; + return new CXFA_DefFontMgr; } // virtual IXFA_FontMgr::~IXFA_FontMgr() {} @@ -2110,7 +2110,7 @@ IFX_Font* CXFA_FontMgr::GetFont(IXFA_Doc* hDoc, } void CXFA_FontMgr::LoadDocFonts(IXFA_Doc* hDoc) { if (!m_PDFFontMgrArray.GetValueAt(hDoc)) { - m_PDFFontMgrArray.SetAt(hDoc, FX_NEW CXFA_PDFFontMgr((CXFA_FFDoc*)hDoc)); + m_PDFFontMgrArray.SetAt(hDoc, new CXFA_PDFFontMgr((CXFA_FFDoc*)hDoc)); } } void CXFA_FontMgr::ReleaseDocFonts(IXFA_Doc* hDoc) { diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 5cccadba23..14d7b99c38 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -26,17 +26,17 @@ CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp) : m_pApp(pApp) { m_pCalendarFont = NULL; m_Rect.Set(0, 0, 0, 0); m_SizeAboveBelow.Set(0, 0); - m_pCheckBoxTP = FX_NEW CXFA_FWLCheckBoxTP; - m_pListBoxTP = FX_NEW CFWL_ListBoxTP; - m_pPictureBoxTP = FX_NEW CFWL_PictureBoxTP; - m_pSrollBarTP = FX_NEW CFWL_ScrollBarTP; - m_pEditTP = FX_NEW CXFA_FWLEditTP; - m_pComboBoxTP = FX_NEW CFWL_ComboBoxTP; - m_pMonthCalendarTP = FX_NEW CFWL_MonthCalendarTP; - m_pDateTimePickerTP = FX_NEW CFWL_DateTimePickerTP; - m_pPushButtonTP = FX_NEW CFWL_PushButtonTP; - m_pCaretTP = FX_NEW CFWL_CaretTP; - m_pBarcodeTP = FX_NEW CFWL_BarcodeTP; + m_pCheckBoxTP = new CXFA_FWLCheckBoxTP; + m_pListBoxTP = new CFWL_ListBoxTP; + m_pPictureBoxTP = new CFWL_PictureBoxTP; + m_pSrollBarTP = new CFWL_ScrollBarTP; + m_pEditTP = new CXFA_FWLEditTP; + m_pComboBoxTP = new CFWL_ComboBoxTP; + m_pMonthCalendarTP = new CFWL_MonthCalendarTP; + m_pDateTimePickerTP = new CFWL_DateTimePickerTP; + m_pPushButtonTP = new CFWL_PushButtonTP; + m_pCaretTP = new CFWL_CaretTP; + m_pBarcodeTP = new CFWL_BarcodeTP; Initialize(); } CXFA_FWLTheme::~CXFA_FWLTheme() { diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 0b48cff987..b79402d1a4 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -10,7 +10,7 @@ #include "xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 IXFA_RenderContext* XFA_RenderContext_Create() { - return FX_NEW CXFA_RenderContext; + return new CXFA_RenderContext; } CXFA_RenderContext::CXFA_RenderContext() { m_pWidgetIterator = NULL; diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 8e548a99f5..145da83baf 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -37,8 +37,8 @@ void CXFA_CSSTagProvider::GetNextAttribute(FX_POSITION& pos, } void CXFA_CSSTagProvider::SetAttribute(const CFX_WideString& wsAttr, const CFX_WideString& wsValue) { - CFX_WideString* pName = FX_NEW CFX_WideString(); - CFX_WideString* pValue = FX_NEW CFX_WideString(); + CFX_WideString* pName = new CFX_WideString(); + CFX_WideString* pValue = new CFX_WideString(); *pName = wsAttr; *pValue = wsValue; m_Attributes.SetAt(pName, pValue); @@ -881,7 +881,7 @@ void CXFA_TextLayout::InitBreak(IFDE_CSSComputedStyle* pStyle, m_pBreak->SetLinePos(fStart); m_pBreak->SetTabWidth(m_textParser.GetTabInterval(pStyle)); if (m_pTabstopContext == NULL) { - m_pTabstopContext = FX_NEW CXFA_TextTabstopsContext; + m_pTabstopContext = new CXFA_TextTabstopsContext; } m_textParser.GetTabstops(pStyle, m_pTabstopContext); for (int32_t i = 0; i < m_pTabstopContext->m_iTabCount; i++) { @@ -933,7 +933,7 @@ FX_FLOAT CXFA_TextLayout::GetLayoutHeight() { } FX_FLOAT CXFA_TextLayout::StartLayout(FX_FLOAT fWidth) { if (m_pLoader == NULL) { - m_pLoader = FX_NEW CXFA_LoaderContext; + m_pLoader = new CXFA_LoaderContext; } if (fWidth < 0 || (m_pLoader->m_fWidth > -1 && FXSYS_fabs(fWidth - m_pLoader->m_fWidth) > 0)) { diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index feb7966274..8641cae71b 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -7183,7 +7183,7 @@ CXFA_FM2JSContext::~CXFA_FM2JSContext() { m_hScriptRuntime = NULL; } CXFA_FM2JSContext* CXFA_FM2JSContext::Create() { - return FX_NEW CXFA_FM2JSContext; + return new CXFA_FM2JSContext; } void CXFA_FM2JSContext::Initialize(FXJSE_HRUNTIME hScriptRuntime, FXJSE_HCONTEXT hScriptContext, diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp index 6186da1abd..595e6556c5 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp @@ -26,7 +26,7 @@ int32_t CXFA_FMParse::Init(const CFX_WideStringC& wsFormcalc, m_pScript = wsFormcalc.GetPtr(); m_uLength = wsFormcalc.GetLength(); m_pErrorInfo = pErrorInfo; - m_lexer = FX_NEW CXFA_FMLexer(wsFormcalc, m_pErrorInfo); + m_lexer = new CXFA_FMLexer(wsFormcalc, m_pErrorInfo); if (m_lexer == 0) { return -1; } @@ -59,7 +59,7 @@ void CXFA_FMParse::Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...) { } CFX_PtrArray* CXFA_FMParse::ParseTopExpression() { CXFA_FMExpression* e = 0; - CFX_PtrArray* expression = FX_NEW CFX_PtrArray(); + CFX_PtrArray* expression = new CFX_PtrArray(); while (1) { if (m_pToken->m_type == TOKeof) { return expression; @@ -113,7 +113,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() { if (m_pToken->m_type == TOKrparen) { NextToken(); } else { - pArguments = FX_NEW CFX_WideStringCArray(); + pArguments = new CFX_WideStringCArray(); CFX_WideStringC p; while (1) { if (m_pToken->m_type == TOKidentifier) { @@ -147,7 +147,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() { Check(TOKendfunc); } if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMFunctionDefinition(line, 0, ident, pArguments, + e = new CXFA_FMFunctionDefinition(line, 0, ident, pArguments, pExpressions); } else { int32_t size = 0; @@ -206,11 +206,11 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpression() { e = ParseDoExpression(); break; case TOKbreak: - e = FX_NEW CXFA_FMBreakExpression(line); + e = new CXFA_FMBreakExpression(line); NextToken(); break; case TOKcontinue: - e = FX_NEW CXFA_FMContinueExpression(line); + e = new CXFA_FMContinueExpression(line); NextToken(); break; default: @@ -240,7 +240,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseVarExpression() { e = ParseExpExpression(); } if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMVarExpression(line, ident, e); + e = new CXFA_FMVarExpression(line, ident, e); } else { delete e; e = 0; @@ -255,7 +255,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseSimpleExpression() { NextToken(); pExp2 = ParseLogicalOrExpression(); if (m_pErrorInfo->message.IsEmpty()) { - pExp1 = FX_NEW CXFA_FMAssignExpression(line, TOKassign, pExp1, pExp2); + pExp1 = new CXFA_FMAssignExpression(line, TOKassign, pExp1, pExp2); } else { delete pExp1; pExp1 = 0; @@ -269,7 +269,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpExpression() { CXFA_FMSimpleExpression* pExp1 = 0; pExp1 = ParseSimpleExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMExpExpression(line, pExp1); + e = new CXFA_FMExpExpression(line, pExp1); } else { delete pExp1; e = 0; @@ -287,7 +287,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalOrExpression() { NextToken(); e2 = ParseLogicalAndExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMLogicalOrExpression(line, TOKor, e1, e2); + e1 = new CXFA_FMLogicalOrExpression(line, TOKor, e1, e2); } else { delete e1; e1 = 0; @@ -311,7 +311,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalAndExpression() { NextToken(); e2 = ParseEqualityExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMLogicalAndExpression(line, TOKand, e1, e2); + e1 = new CXFA_FMLogicalAndExpression(line, TOKand, e1, e2); } else { delete e1; e1 = 0; @@ -335,7 +335,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() { NextToken(); e2 = ParseRelationalExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMEqualityExpression(line, TOKeq, e1, e2); + e1 = new CXFA_FMEqualityExpression(line, TOKeq, e1, e2); } else { delete e1; e1 = 0; @@ -346,7 +346,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() { NextToken(); e2 = ParseRelationalExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMEqualityExpression(line, TOKne, e1, e2); + e1 = new CXFA_FMEqualityExpression(line, TOKne, e1, e2); } else { delete e1; e1 = 0; @@ -370,7 +370,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { NextToken(); e2 = ParseAddtiveExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMRelationalExpression(line, TOKlt, e1, e2); + e1 = new CXFA_FMRelationalExpression(line, TOKlt, e1, e2); } else { delete e1; e1 = 0; @@ -381,7 +381,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { NextToken(); e2 = ParseAddtiveExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMRelationalExpression(line, TOKgt, e1, e2); + e1 = new CXFA_FMRelationalExpression(line, TOKgt, e1, e2); } else { delete e1; e1 = 0; @@ -392,7 +392,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { NextToken(); e2 = ParseAddtiveExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMRelationalExpression(line, TOKle, e1, e2); + e1 = new CXFA_FMRelationalExpression(line, TOKle, e1, e2); } else { delete e1; e1 = 0; @@ -403,7 +403,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() { NextToken(); e2 = ParseAddtiveExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMRelationalExpression(line, TOKge, e1, e2); + e1 = new CXFA_FMRelationalExpression(line, TOKge, e1, e2); } else { delete e1; e1 = 0; @@ -426,7 +426,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() { NextToken(); e2 = ParseMultiplicativeExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMAdditiveExpression(line, TOKplus, e1, e2); + e1 = new CXFA_FMAdditiveExpression(line, TOKplus, e1, e2); } else { delete e1; e1 = 0; @@ -436,7 +436,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() { NextToken(); e2 = ParseMultiplicativeExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMAdditiveExpression(line, TOKminus, e1, e2); + e1 = new CXFA_FMAdditiveExpression(line, TOKminus, e1, e2); } else { delete e1; e1 = 0; @@ -459,7 +459,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() { NextToken(); e2 = ParseUnaryExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMMultiplicativeExpression(line, TOKmul, e1, e2); + e1 = new CXFA_FMMultiplicativeExpression(line, TOKmul, e1, e2); } else { delete e1; e1 = 0; @@ -469,7 +469,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() { NextToken(); e2 = ParseUnaryExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e1 = FX_NEW CXFA_FMMultiplicativeExpression(line, TOKdiv, e1, e2); + e1 = new CXFA_FMMultiplicativeExpression(line, TOKdiv, e1, e2); } else { delete e1; e1 = 0; @@ -490,7 +490,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() { NextToken(); e = ParseUnaryExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMPosExpression(line, e); + e = new CXFA_FMPosExpression(line, e); } else { e = 0; } @@ -499,7 +499,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() { NextToken(); e = ParseUnaryExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMNegExpression(line, e); + e = new CXFA_FMNegExpression(line, e); } else { e = 0; } @@ -508,7 +508,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() { NextToken(); e = ParseUnaryExpression(); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMNotExpression(line, e); + e = new CXFA_FMNotExpression(line, e); } else { e = 0; } @@ -524,11 +524,11 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() { FX_DWORD line = m_pToken->m_uLinenum; switch (m_pToken->m_type) { case TOKnumber: - e = FX_NEW CXFA_FMNumberExpression(line, m_pToken->m_wstring); + e = new CXFA_FMNumberExpression(line, m_pToken->m_wstring); NextToken(); break; case TOKstring: - e = FX_NEW CXFA_FMStringExpression(line, m_pToken->m_wstring); + e = new CXFA_FMStringExpression(line, m_pToken->m_wstring); NextToken(); break; case TOKidentifier: { @@ -537,20 +537,20 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() { if (m_pToken->m_type == TOKlbracket) { CXFA_FMSimpleExpression* s = ParseIndexExpression(); if (s) { - e = FX_NEW CXFA_FMDotAccessorExpression(line, NULL, TOKdot, + e = new CXFA_FMDotAccessorExpression(line, NULL, TOKdot, wsIdentifier, s); } NextToken(); } else { - e = FX_NEW CXFA_FMIdentifierExpressionn(line, wsIdentifier); + e = new CXFA_FMIdentifierExpressionn(line, wsIdentifier); } } break; case TOKif: - e = FX_NEW CXFA_FMIdentifierExpressionn(line, m_pToken->m_wstring); + e = new CXFA_FMIdentifierExpressionn(line, m_pToken->m_wstring); NextToken(); break; case TOKnull: - e = FX_NEW CXFA_FMNullExpression(line); + e = new CXFA_FMNullExpression(line); NextToken(); break; case TOKlparen: @@ -579,7 +579,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( NextToken(); CFX_PtrArray* pArray = 0; if (m_pToken->m_type != TOKrparen) { - pArray = FX_NEW CFX_PtrArray(); + pArray = new CFX_PtrArray(); while (m_pToken->m_type != TOKrparen) { CXFA_FMSimpleExpression* e = ParseSimpleExpression(); if (e) { @@ -598,14 +598,14 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } } if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMCallExpression(line, e, pArray, FALSE); + e = new CXFA_FMCallExpression(line, e, pArray, FALSE); NextToken(); if (m_pToken->m_type != TOKlbracket) { continue; } CXFA_FMSimpleExpression* s = ParseIndexExpression(); if (s) { - e = FX_NEW CXFA_FMDotAccessorExpression(line, e, TOKcall, + e = new CXFA_FMDotAccessorExpression(line, e, TOKcall, FX_WSTRC(L""), s); } else { delete e; @@ -636,7 +636,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( NextToken(); CFX_PtrArray* pArray = 0; if (m_pToken->m_type != TOKrparen) { - pArray = FX_NEW CFX_PtrArray(); + pArray = new CFX_PtrArray(); while (m_pToken->m_type != TOKrparen) { CXFA_FMSimpleExpression* exp = ParseSimpleExpression(); pArray->Add(exp); @@ -654,10 +654,10 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } if (m_pErrorInfo->message.IsEmpty()) { CXFA_FMSimpleExpression* pIdentifier = - FX_NEW CXFA_FMIdentifierExpressionn(tempLine, tempStr); + new CXFA_FMIdentifierExpressionn(tempLine, tempStr); pExpCall = - FX_NEW CXFA_FMCallExpression(line, pIdentifier, pArray, TRUE); - e = FX_NEW CXFA_FMMethodCallExpression(line, pExpAccessor, + new CXFA_FMCallExpression(line, pIdentifier, pArray, TRUE); + e = new CXFA_FMMethodCallExpression(line, pExpAccessor, pExpCall); NextToken(); if (m_pToken->m_type != TOKlbracket) { @@ -665,7 +665,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } CXFA_FMSimpleExpression* s = ParseIndexExpression(); if (s) { - e = FX_NEW CXFA_FMDotAccessorExpression(line, e, TOKcall, + e = new CXFA_FMDotAccessorExpression(line, e, TOKcall, FX_WSTRC(L""), s); } else { delete e; @@ -695,12 +695,12 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } return e; } - e = FX_NEW CXFA_FMDotAccessorExpression(tempLine, e, TOKdot, + e = new CXFA_FMDotAccessorExpression(tempLine, e, TOKdot, tempStr, s); } else { - CXFA_FMSimpleExpression* s = FX_NEW CXFA_FMIndexExpression( + CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( tempLine, ACCESSOR_NO_INDEX, NULL, FALSE); - e = FX_NEW CXFA_FMDotAccessorExpression(line, e, TOKdot, tempStr, + e = new CXFA_FMDotAccessorExpression(line, e, TOKdot, tempStr, s); continue; } @@ -730,12 +730,12 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } return e; } - e = FX_NEW CXFA_FMDotDotAccessorExpression(tempLine, e, TOKdotdot, + e = new CXFA_FMDotDotAccessorExpression(tempLine, e, TOKdotdot, tempStr, s); } else { - CXFA_FMSimpleExpression* s = FX_NEW CXFA_FMIndexExpression( + CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( tempLine, ACCESSOR_NO_INDEX, NULL, FALSE); - e = FX_NEW CXFA_FMDotDotAccessorExpression(line, e, TOKdotdot, + e = new CXFA_FMDotDotAccessorExpression(line, e, TOKdotdot, tempStr, s); continue; } @@ -765,12 +765,12 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } return e; } - e = FX_NEW CXFA_FMDotAccessorExpression(tempLine, e, TOKdotscream, + e = new CXFA_FMDotAccessorExpression(tempLine, e, TOKdotscream, tempStr, s); } else { - CXFA_FMSimpleExpression* s = FX_NEW CXFA_FMIndexExpression( + CXFA_FMSimpleExpression* s = new CXFA_FMIndexExpression( tempLine, ACCESSOR_NO_INDEX, NULL, FALSE); - e = FX_NEW CXFA_FMDotAccessorExpression(line, e, TOKdotscream, + e = new CXFA_FMDotAccessorExpression(line, e, TOKdotscream, tempStr, s); continue; } @@ -783,8 +783,8 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( break; case TOKdotstar: { CXFA_FMSimpleExpression* s = - FX_NEW CXFA_FMIndexExpression(line, ACCESSOR_NO_INDEX, NULL, FALSE); - e = FX_NEW CXFA_FMDotAccessorExpression(line, e, TOKdotstar, + new CXFA_FMIndexExpression(line, ACCESSOR_NO_INDEX, NULL, FALSE); + e = new CXFA_FMDotAccessorExpression(line, e, TOKdotstar, FX_WSTRC(L"*"), s); } break; default: @@ -801,7 +801,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() { CXFA_FMSimpleExpression* s = 0; XFA_FM_AccessorIndex accessorIndex = ACCESSOR_NO_RELATIVEINDEX; if (m_pToken->m_type == TOKmul) { - pExp = FX_NEW CXFA_FMIndexExpression(line, accessorIndex, s, TRUE); + pExp = new CXFA_FMIndexExpression(line, accessorIndex, s, TRUE); NextToken(); if (m_pToken->m_type != TOKrbracket) { CFX_WideString ws_TempString = m_pToken->m_wstring; @@ -830,7 +830,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() { delete s; } } else { - pExp = FX_NEW CXFA_FMIndexExpression(line, accessorIndex, s, FALSE); + pExp = new CXFA_FMIndexExpression(line, accessorIndex, s, FALSE); } return pExp; } @@ -844,7 +844,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() { NextToken(); pExp2 = ParseLogicalOrExpression(); if (m_pErrorInfo->message.IsEmpty()) { - pExp1 = FX_NEW CXFA_FMAssignExpression(line, TOKassign, pExp1, pExp2); + pExp1 = new CXFA_FMAssignExpression(line, TOKassign, pExp1, pExp2); } else { delete pExp1; pExp1 = 0; @@ -859,7 +859,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() { CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() { FX_DWORD line = m_pToken->m_uLinenum; CXFA_FMExpression* e = 0; - CFX_PtrArray* expression = FX_NEW CFX_PtrArray(); + CFX_PtrArray* expression = new CFX_PtrArray(); while (1) { switch (m_pToken->m_type) { case TOKeof: @@ -888,7 +888,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() { } CXFA_FMBlockExpression* pExp = 0; if (m_pErrorInfo->message.IsEmpty()) { - pExp = FX_NEW CXFA_FMBlockExpression(line, expression); + pExp = new CXFA_FMBlockExpression(line, expression); } else { int32_t size = expression->GetSize(); int32_t index = 0; @@ -928,7 +928,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() { delete pExpression; } m_lexer->SetCurrentLine(line); - m_pToken = FX_NEW CXFA_FMToken(line); + m_pToken = new CXFA_FMToken(line); m_pToken->m_type = TOKidentifier; m_pToken->m_wstring = FX_WSTRC(L"if"); m_lexer->SetToken(m_pToken); @@ -962,7 +962,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() { } CXFA_FMIfExpression* pExp = 0; if (m_pErrorInfo->message.IsEmpty()) { - pExp = FX_NEW CXFA_FMIfExpression(line, pExpression, pIfExpression, + pExp = new CXFA_FMIfExpression(line, pExpression, pIfExpression, pElseExpression); } else { if (pExpression) { @@ -997,7 +997,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseWhileExpression() { delete e; e = 0; } else { - e = FX_NEW CXFA_FMWhileExpression(line, pCondition, pExpression); + e = new CXFA_FMWhileExpression(line, pCondition, pExpression); } return e; } @@ -1060,7 +1060,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForExpression() { pList = ParseBlockExpression(); Check(TOKendfor); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMForExpression(line, wsVariant, pAssignment, pAccessor, + e = new CXFA_FMForExpression(line, wsVariant, pAssignment, pAccessor, iDirection, pStep, pList); } else { if (pAssignment) { @@ -1100,7 +1100,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() { ws_TempString.c_str()); NextToken(); } else { - pAccessors = FX_NEW CFX_PtrArray(); + pAccessors = new CFX_PtrArray(); while (m_pToken->m_type != TOKrparen) { CXFA_FMSimpleExpression* s = ParseSimpleExpression(); if (s) { @@ -1118,7 +1118,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() { pList = ParseBlockExpression(); Check(TOKendfor); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMForeachExpression(line, wsIdentifier, pAccessors, pList); + e = new CXFA_FMForeachExpression(line, wsIdentifier, pAccessors, pList); } else { if (pAccessors) { CXFA_FMSimpleExpression* s = 0; @@ -1146,7 +1146,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseDoExpression() { e = ParseBlockExpression(); Check(TOKend); if (m_pErrorInfo->message.IsEmpty()) { - e = FX_NEW CXFA_FMDoExpression(line, e); + e = new CXFA_FMDoExpression(line, e); } else { delete e; e = 0; diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp index aaef77496e..3b5f66dd72 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp @@ -182,7 +182,7 @@ CXFA_FMToken* CXFA_FMLexer::NextToken() { } CXFA_FMToken* CXFA_FMLexer::Scan() { uint16_t ch = 0; - CXFA_FMToken* p = FX_NEW CXFA_FMToken(m_uCurrentLine); + CXFA_FMToken* p = new CXFA_FMToken(m_uCurrentLine); if (!XFA_FMDChar::isAvalid(m_ptr)) { ch = XFA_FMDChar::get(m_ptr); Error(FMERR_UNSUPPORTED_CHAR, ch); diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.cpp b/xfa/src/fxfa/src/fm2js/xfa_program.cpp index cd83c82772..e844d08c67 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_program.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_program.cpp @@ -34,7 +34,7 @@ int32_t CXFA_FMProgram::ParseProgram() { return -1; } m_globalFunction = - FX_NEW CXFA_FMFunctionDefinition(1, 1, FX_WSTRC(L""), 0, expressions); + new CXFA_FMFunctionDefinition(1, 1, FX_WSTRC(L""), 0, expressions); return 0; } int32_t CXFA_FMProgram::TranslateProgram(CFX_WideTextBuf& wsJavaScript) { 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; + new CFX_MapPtrTemplate; } 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; + new CFX_MapPtrTemplate; } 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) { -- cgit v1.2.3