diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
| commit | ae51c810a44844ef437393c1768be8f7766586b2 (patch) | |
| tree | 373bbfa8c8720af43d58a9982beea3ebf10c5d6d | |
| parent | e3166a8c39c8943f6cafb2ffe10bd9564e3eaf16 (diff) | |
| download | pdfium-ae51c810a44844ef437393c1768be8f7766586b2.tar.xz | |
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 .
222 files changed, 1382 insertions, 1384 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 925f3efaf1..d1615b5a31 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -102,7 +102,7 @@ class CPDF_Object { class CPDF_Boolean : public CPDF_Object { public: static CPDF_Boolean* Create(FX_BOOL value) { - return FX_NEW CPDF_Boolean(value); + return new CPDF_Boolean(value); } CPDF_Boolean() : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(false) {} @@ -118,18 +118,18 @@ class CPDF_Boolean : public CPDF_Object { }; class CPDF_Number : public CPDF_Object { public: - static CPDF_Number* Create(int value) { return FX_NEW CPDF_Number(value); } + static CPDF_Number* Create(int value) { return new CPDF_Number(value); } static CPDF_Number* Create(FX_FLOAT value) { - return FX_NEW CPDF_Number(value); + return new CPDF_Number(value); } static CPDF_Number* Create(const CFX_ByteStringC& str) { - return FX_NEW CPDF_Number(str); + return new CPDF_Number(str); } static CPDF_Number* Create(FX_BOOL bInteger, void* pData) { - return FX_NEW CPDF_Number(bInteger, pData); + return new CPDF_Number(bInteger, pData); } CPDF_Number() : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(false), m_Integer(0) {} @@ -177,11 +177,11 @@ class CPDF_Number : public CPDF_Object { class CPDF_String : public CPDF_Object { public: static CPDF_String* Create(const CFX_ByteString& str, FX_BOOL bHex = FALSE) { - return FX_NEW CPDF_String(str, bHex); + return new CPDF_String(str, bHex); } static CPDF_String* Create(const CFX_WideString& str) { - return FX_NEW CPDF_String(str); + return new CPDF_String(str); } CPDF_String() : CPDF_Object(PDFOBJ_STRING), m_bHex(FALSE) {} @@ -208,14 +208,14 @@ class CPDF_String : public CPDF_Object { class CPDF_Name : public CPDF_Object { public: static CPDF_Name* Create(const CFX_ByteString& str) { - return FX_NEW CPDF_Name(str); + return new CPDF_Name(str); } static CPDF_Name* Create(const CFX_ByteStringC& str) { - return FX_NEW CPDF_Name(str); + return new CPDF_Name(str); } - static CPDF_Name* Create(const FX_CHAR* str) { return FX_NEW CPDF_Name(str); } + static CPDF_Name* Create(const FX_CHAR* str) { return new CPDF_Name(str); } CPDF_Name(const CFX_ByteString& str) : CPDF_Object(PDFOBJ_NAME), m_Name(str) {} @@ -235,7 +235,7 @@ class CPDF_Name : public CPDF_Object { }; class CPDF_Array : public CPDF_Object { public: - static CPDF_Array* Create() { return FX_NEW CPDF_Array(); } + static CPDF_Array* Create() { return new CPDF_Array(); } CPDF_Array() : CPDF_Object(PDFOBJ_ARRAY) {} @@ -305,7 +305,7 @@ class CPDF_Array : public CPDF_Object { }; class CPDF_Dictionary : public CPDF_Object { public: - static CPDF_Dictionary* Create() { return FX_NEW CPDF_Dictionary(); } + static CPDF_Dictionary* Create() { return new CPDF_Dictionary(); } CPDF_Dictionary() : CPDF_Object(PDFOBJ_DICTIONARY) {} @@ -413,7 +413,7 @@ class CPDF_Stream : public CPDF_Object { static CPDF_Stream* Create(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict) { - return FX_NEW CPDF_Stream(pData, size, pDict); + return new CPDF_Stream(pData, size, pDict); } CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict); @@ -546,14 +546,14 @@ class CPDF_StreamFilter { }; class CPDF_Null : public CPDF_Object { public: - static CPDF_Null* Create() { return FX_NEW CPDF_Null(); } + static CPDF_Null* Create() { return new CPDF_Null(); } CPDF_Null() : CPDF_Object(PDFOBJ_NULL) {} }; class CPDF_Reference : public CPDF_Object { public: static CPDF_Reference* Create(CPDF_IndirectObjects* pDoc, int objnum) { - return FX_NEW CPDF_Reference(pDoc, objnum); + return new CPDF_Reference(pDoc, objnum); } CPDF_Reference(CPDF_IndirectObjects* pDoc, int objnum) diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index d93d3f7193..62a8f2a369 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -1056,7 +1056,7 @@ class CFX_CountRef { } m_pObject = NULL; } - m_pObject = FX_NEW CountedObj; + m_pObject = new CountedObj; if (!m_pObject) { return NULL; } @@ -1099,7 +1099,7 @@ class CFX_CountRef { ObjClass* GetModify() { if (m_pObject == NULL) { - m_pObject = FX_NEW CountedObj; + m_pObject = new CountedObj; if (m_pObject) { m_pObject->m_RefCount = 1; } @@ -1107,7 +1107,7 @@ class CFX_CountRef { m_pObject->m_RefCount--; CountedObj* pOldObject = m_pObject; m_pObject = NULL; - m_pObject = FX_NEW CountedObj(*pOldObject); + m_pObject = new CountedObj(*pOldObject); if (m_pObject) { m_pObject->m_RefCount = 1; } diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index e24aa3ecf4..c607de2159 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -23,8 +23,6 @@ void FXMEM_DefaultFree(void* pointer, int flags); #include <limits> #include <new> -#define FX_NEW new - NEVER_INLINE void FX_OutOfMemoryTerminate(); inline void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) { diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index e9df5e1d7e..e50e4057be 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -232,7 +232,7 @@ CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) { if (m_APMap.Lookup(pStream, (void*&)pForm)) { return pForm; } - pForm = FX_NEW CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream); + pForm = new CPDF_Form(m_pList->m_pDocument, pPage->m_pResources, pStream); if (pForm == NULL) { return NULL; } diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index a921d4980a..d25fd27d13 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -101,7 +101,7 @@ CFieldTree::_Node* CFieldTree::AddChild(_Node* pParent, if (pParent == NULL) { return NULL; } - _Node* pNode = FX_NEW _Node; + _Node* pNode = new _Node; if (pNode == NULL) { return NULL; } @@ -241,7 +241,7 @@ CPDF_InterForm::CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bGenerateAP) m_bGenerateAP = bGenerateAP; m_pFormNotify = NULL; m_bUpdated = FALSE; - m_pFieldTree = FX_NEW CFieldTree; + m_pFieldTree = new CFieldTree; CPDF_Dictionary* pRoot = m_pDocument->GetRoot(); m_pFormDict = pRoot->GetDict("AcroForm"); if (m_pFormDict == NULL) { @@ -1289,7 +1289,7 @@ CPDF_FormField* CPDF_InterForm::AddTerminalField( } } } - pField = FX_NEW CPDF_FormField(this, pParent); + pField = new CPDF_FormField(this, pParent); CPDF_Object* pTObj = pDict->GetElement("T"); if (pTObj && pTObj->GetType() == PDFOBJ_REFERENCE) { CPDF_Object* pClone = pTObj->Clone(TRUE); @@ -1327,7 +1327,7 @@ CPDF_FormControl* CPDF_InterForm::AddControl( if (m_ControlMap.Lookup((CPDF_Dictionary*)pWidgetDict, rValue)) { return (CPDF_FormControl*)rValue; } - CPDF_FormControl* pControl = FX_NEW CPDF_FormControl( + CPDF_FormControl* pControl = new CPDF_FormControl( (CPDF_FormField*)pField, (CPDF_Dictionary*)pWidgetDict); if (pControl == NULL) { return NULL; diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp index 2bc14d9c33..e350ea6f41 100644 --- a/core/src/fpdfdoc/doc_metadata.cpp +++ b/core/src/fpdfdoc/doc_metadata.cpp @@ -22,7 +22,7 @@ CPDF_Metadata::CPDF_Metadata() { m_pData = FX_Alloc(PDFDOC_METADATA, 1); CFX_CMapByteStringToPtr*& pStringMap = ((PDFDOC_LPMETADATA)m_pData)->m_pStringMap; - pStringMap = FX_NEW CFX_CMapByteStringToPtr; + pStringMap = new CFX_CMapByteStringToPtr; if (pStringMap != NULL) { CFX_ByteString bstr; for (int i = 0; i < 18; i += 2) { diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp index fe7e5e13b9..d8e24c78b3 100644 --- a/core/src/fpdfdoc/doc_tagged.cpp +++ b/core/src/fpdfdoc/doc_tagged.cpp @@ -19,7 +19,7 @@ CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc, if (!IsTagged(pDoc)) { return NULL; } - CPDF_StructTreeImpl* pTree = FX_NEW CPDF_StructTreeImpl(pDoc); + CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc); if (pTree == NULL) { return NULL; } @@ -30,7 +30,7 @@ CPDF_StructTree* CPDF_StructTree::LoadDoc(const CPDF_Document* pDoc) { if (!IsTagged(pDoc)) { return NULL; } - CPDF_StructTreeImpl* pTree = FX_NEW CPDF_StructTreeImpl(pDoc); + CPDF_StructTreeImpl* pTree = new CPDF_StructTreeImpl(pDoc); if (pTree == NULL) { return NULL; } @@ -62,7 +62,7 @@ void CPDF_StructTreeImpl::LoadDocTree() { } if (pKids->GetType() == PDFOBJ_DICTIONARY) { CPDF_StructElementImpl* pStructElementImpl = - FX_NEW CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids); + new CPDF_StructElementImpl(this, NULL, (CPDF_Dictionary*)pKids); if (pStructElementImpl == NULL) { return; } @@ -76,7 +76,7 @@ void CPDF_StructTreeImpl::LoadDocTree() { for (FX_DWORD i = 0; i < pArray->GetCount(); i++) { CPDF_Dictionary* pKid = pArray->GetDict(i); CPDF_StructElementImpl* pStructElementImpl = - FX_NEW CPDF_StructElementImpl(this, NULL, pKid); + new CPDF_StructElementImpl(this, NULL, pKid); if (pStructElementImpl == NULL) { return; } @@ -137,7 +137,7 @@ CPDF_StructElementImpl* CPDF_StructTreeImpl::AddPageNode(CPDF_Dictionary* pDict, if (map.Lookup(pDict, (void*&)pElement)) { return pElement; } - pElement = FX_NEW CPDF_StructElementImpl(this, NULL, pDict); + pElement = new CPDF_StructElementImpl(this, NULL, pDict); if (pElement == NULL) { return NULL; } @@ -321,7 +321,7 @@ void CPDF_StructElementImpl::LoadKid(FX_DWORD PageObjNum, pKid->m_Element.m_pDict = pKidDict; if (m_pTree->m_pPage == NULL) { pKid->m_Element.m_pElement = - FX_NEW CPDF_StructElementImpl(m_pTree, this, pKidDict); + new CPDF_StructElementImpl(m_pTree, this, pKidDict); } else { pKid->m_Element.m_pElement = NULL; } diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp index b2eaa8a5fc..77afab81b9 100644 --- a/core/src/fpdfdoc/doc_vt.cpp +++ b/core/src/fpdfdoc/doc_vt.cpp @@ -69,7 +69,7 @@ void CSection::ResetLinePlace() { } CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace& place, const CPVT_WordInfo& wordinfo) { - if (CPVT_WordInfo* pWord = FX_NEW CPVT_WordInfo(wordinfo)) { + if (CPVT_WordInfo* pWord = new CPVT_WordInfo(wordinfo)) { int32_t nWordIndex = FPDF_MAX(FPDF_MIN(place.nWordIndex, m_WordArray.GetSize()), 0); if (nWordIndex == m_WordArray.GetSize()) { @@ -815,8 +815,8 @@ void CPDF_VariableText::Initialize() { if (!m_bInitial) { CPVT_SectionInfo secinfo; if (m_bRichText) { - secinfo.pSecProps = FX_NEW CPVT_SecProps(0.0f, 0.0f, 0); - secinfo.pWordProps = FX_NEW CPVT_WordProps(GetDefaultFontIndex(), + secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0); + secinfo.pWordProps = new CPVT_WordProps(GetDefaultFontIndex(), PVT_DEFAULT_FONTSIZE, 0, 0, 0); } CPVT_WordPlace place; @@ -884,10 +884,10 @@ CPVT_WordPlace CPDF_VariableText::InsertSection( CPVT_SectionInfo secinfo; if (m_bRichText) { if (pSecProps) { - secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps); + secinfo.pSecProps = new CPVT_SecProps(*pSecProps); } if (pWordProps) { - secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps); + secinfo.pWordProps = new CPVT_WordProps(*pWordProps); } } AddSection(NewPlace, secinfo); @@ -976,10 +976,10 @@ void CPDF_VariableText::SetText(const FX_WCHAR* text, CPVT_SectionInfo secinfo; if (m_bRichText) { if (pSecProps) { - secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps); + secinfo.pSecProps = new CPVT_SecProps(*pSecProps); } if (pWordProps) { - secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps); + secinfo.pWordProps = new CPVT_WordProps(*pWordProps); } } if (CSection* pSection = m_SectionArray.GetAt(0)) { @@ -1662,7 +1662,7 @@ FX_BOOL CPDF_VariableText::IsLatinWord(FX_WORD word) { } IPDF_VariableText_Iterator* CPDF_VariableText::GetIterator() { if (!m_pVTIterator) { - return m_pVTIterator = FX_NEW CPDF_VariableText_Iterator(this); + return m_pVTIterator = new CPDF_VariableText_Iterator(this); } return m_pVTIterator; } diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/src/fpdfdoc/doc_vtmodule.cpp index efb9d22dc5..834d459de3 100644 --- a/core/src/fpdfdoc/doc_vtmodule.cpp +++ b/core/src/fpdfdoc/doc_vtmodule.cpp @@ -8,7 +8,7 @@ #include "../../include/fpdfdoc/fpdf_vt.h" #include "pdf_vt.h" IPDF_VariableText* IPDF_VariableText::NewVariableText() { - return FX_NEW CPDF_VariableText(); + return new CPDF_VariableText(); } void IPDF_VariableText::DelVariableText(IPDF_VariableText* pVT) { delete (CPDF_VariableText*)pVT; diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h index 728dbbfebb..81d9d6a879 100644 --- a/core/src/fpdfdoc/pdf_vt.h +++ b/core/src/fpdfdoc/pdf_vt.h @@ -85,14 +85,14 @@ struct CPVT_SectionInfo { if (pSecProps) { *pSecProps = *other.pSecProps; } else { - pSecProps = FX_NEW CPVT_SecProps(*other.pSecProps); + pSecProps = new CPVT_SecProps(*other.pSecProps); } } if (other.pWordProps) { if (pWordProps) { *pWordProps = *other.pWordProps; } else { - pWordProps = FX_NEW CPVT_WordProps(*other.pWordProps); + pWordProps = new CPVT_WordProps(*other.pWordProps); } } } @@ -162,7 +162,7 @@ struct CPVT_WordInfo { if (pWordProps) { *pWordProps = *word.pWordProps; } else { - pWordProps = FX_NEW CPVT_WordProps(*word.pWordProps); + pWordProps = new CPVT_WordProps(*word.pWordProps); } } } @@ -223,7 +223,7 @@ class CLines { } int32_t Add(const CPVT_LineInfo& lineinfo) { if (m_nTotal >= GetSize()) { - if (CLine* pLine = FX_NEW CLine) { + if (CLine* pLine = new CLine) { pLine->m_LineInfo = lineinfo; m_Lines.Add(pLine); return m_nTotal++; diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 48402df723..3da9a215a4 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -188,7 +188,7 @@ CTextBaseLine* CTextPage::InsertTextBox(CTextBaseLine* pBaseLine, } } if (pBaseLine == NULL) { - pBaseLine = FX_NEW CTextBaseLine; + pBaseLine = new CTextBaseLine; if (NULL == pBaseLine) { return NULL; } @@ -462,7 +462,7 @@ void CTextPage::FindColumns() { CTextBox* pTextBox = (CTextBox*)pBaseLine->m_TextList.GetAt(j); CTextColumn* pColumn = FindColumn(pTextBox->m_Right); if (pColumn == NULL) { - pColumn = FX_NEW CTextColumn; + pColumn = new CTextColumn; if (pColumn) { pColumn->m_Count = 1; pColumn->m_AvgPos = pTextBox->m_Right; @@ -541,7 +541,7 @@ void CTextBaseLine::InsertTextBox(FX_FLOAT leftx, break; } } - CTextBox* pText = FX_NEW CTextBox; + CTextBox* pText = new CTextBox; if (NULL == pText) { return; } diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 2f6a8db204..9d4555c27e 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -84,17 +84,17 @@ CPDFText_ParseOptions::CPDFText_ParseOptions() IPDF_TextPage* IPDF_TextPage::CreateTextPage( const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions) { - CPDF_TextPage* pTextPageEx = FX_NEW CPDF_TextPage(pPage, ParserOptions); + CPDF_TextPage* pTextPageEx = new CPDF_TextPage(pPage, ParserOptions); return pTextPageEx; } IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_Page* pPage, int flags) { - CPDF_TextPage* pTextPage = FX_NEW CPDF_TextPage(pPage, flags); + CPDF_TextPage* pTextPage = new CPDF_TextPage(pPage, flags); return pTextPage; } IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_PageObjects* pObjs, int flags) { - CPDF_TextPage* pTextPage = FX_NEW CPDF_TextPage(pObjs, flags); + CPDF_TextPage* pTextPage = new CPDF_TextPage(pObjs, flags); return pTextPage; } IPDF_TextPageFind* IPDF_TextPageFind::CreatePageFind( @@ -102,10 +102,10 @@ IPDF_TextPageFind* IPDF_TextPageFind::CreatePageFind( if (!pTextPage) { return NULL; } - return FX_NEW CPDF_TextPageFind(pTextPage); + return new CPDF_TextPageFind(pTextPage); } IPDF_LinkExtract* IPDF_LinkExtract::CreateLinkExtract() { - return FX_NEW CPDF_LinkExtract(); + return new CPDF_LinkExtract(); } #define TEXT_BLANK_CHAR L' ' #define TEXT_LINEFEED_CHAR L'\n' @@ -2737,7 +2737,7 @@ FX_BOOL CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl) { CPDF_LinkExt* linkInfo = NULL; - linkInfo = FX_NEW CPDF_LinkExt; + linkInfo = new CPDF_LinkExt; if (!linkInfo) { return FALSE; } diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 9d2d1bd3dd..ab736f9769 100644 --- a/core/src/fxcrt/fx_arabic.cpp +++ b/core/src/fxcrt/fx_arabic.cpp @@ -145,7 +145,7 @@ FX_WCHAR FX_GetArabicFromShaddaTable(FX_WCHAR shadda) { }; #endif IFX_ArabicChar* IFX_ArabicChar::Create() { - return FX_NEW CFX_ArabicChar; + return new CFX_ArabicChar; } FX_BOOL CFX_ArabicChar::IsArabicChar(FX_WCHAR wch) const { FX_DWORD dwRet = @@ -1055,7 +1055,7 @@ void FX_BidiLine(CFX_RTFCharArray& chars, int32_t iCount, int32_t iBaseLevel) { blt.FX_BidiLine(chars, iCount, iBaseLevel); } IFX_BidiChar* IFX_BidiChar::Create() { - return FX_NEW CFX_BidiChar; + return new CFX_BidiChar; } CFX_BidiChar::CFX_BidiChar() : m_bSeparateNeutral(TRUE), diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp index f1512ff0cb..ed71d975c8 100644 --- a/core/src/fxcrt/fx_basic_util.cpp +++ b/core/src/fxcrt/fx_basic_util.cpp @@ -298,7 +298,7 @@ class CFindFileDataW : public CFindFileData { void* FX_OpenFolder(const FX_CHAR* path) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #ifndef _WIN32_WCE - CFindFileDataA* pData = FX_NEW CFindFileDataA; + CFindFileDataA* pData = new CFindFileDataA; if (!pData) { return NULL; } @@ -311,7 +311,7 @@ void* FX_OpenFolder(const FX_CHAR* path) { &pData->m_FindData, FindExSearchNameMatch, NULL, 0); #endif #else - CFindFileDataW* pData = FX_NEW CFindFileDataW; + CFindFileDataW* pData = new CFindFileDataW; if (!pData) { return NULL; } @@ -331,7 +331,7 @@ void* FX_OpenFolder(const FX_CHAR* path) { } void* FX_OpenFolder(const FX_WCHAR* path) { #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - CFindFileDataW* pData = FX_NEW CFindFileDataW; + CFindFileDataW* pData = new CFindFileDataW; if (!pData) { return NULL; } diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 004e39d5e2..402f86cecb 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -18,7 +18,7 @@ IFX_FileAccess* FX_CreateDefaultFileAccess(const CFX_WideStringC& wsPath) { return NULL; CFX_CRTFileAccess* pFA = NULL; - pFA = FX_NEW CFX_CRTFileAccess; + pFA = new CFX_CRTFileAccess; if (NULL == pFA) return NULL; @@ -34,7 +34,7 @@ IFX_FileStream* FX_CreateFileStream(const FX_CHAR* filename, FX_DWORD dwModes) { pFA->Release(); return NULL; } - return FX_NEW CFX_CRTFileStream(pFA); + return new CFX_CRTFileStream(pFA); } IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename, FX_DWORD dwModes) { @@ -46,7 +46,7 @@ IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename, pFA->Release(); return NULL; } - return FX_NEW CFX_CRTFileStream(pFA); + return new CFX_CRTFileStream(pFA); } IFX_FileRead* FX_CreateFileRead(const FX_CHAR* filename) { return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly); @@ -57,10 +57,10 @@ IFX_FileRead* FX_CreateFileRead(const FX_WCHAR* filename) { IFX_MemoryStream* FX_CreateMemoryStream(uint8_t* pBuffer, size_t dwSize, FX_BOOL bTakeOver) { - return FX_NEW CFX_MemoryStream(pBuffer, dwSize, bTakeOver); + return new CFX_MemoryStream(pBuffer, dwSize, bTakeOver); } IFX_MemoryStream* FX_CreateMemoryStream(FX_BOOL bConsecutive) { - return FX_NEW CFX_MemoryStream(bConsecutive); + return new CFX_MemoryStream(bConsecutive); } #ifdef __cplusplus extern "C" { diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp index 61e66fbc0e..6d3c429523 100644 --- a/core/src/fxcrt/fx_xml_parser.cpp +++ b/core/src/fxcrt/fx_xml_parser.cpp @@ -12,14 +12,14 @@ CXML_Parser::~CXML_Parser() { } } FX_BOOL CXML_Parser::Init(uint8_t* pBuffer, size_t size) { - m_pDataAcc = FX_NEW CXML_DataBufAcc(pBuffer, size); + m_pDataAcc = new CXML_DataBufAcc(pBuffer, size); if (!m_pDataAcc) { return FALSE; } return Init(TRUE); } FX_BOOL CXML_Parser::Init(IFX_FileRead* pFileRead) { - m_pDataAcc = FX_NEW CXML_DataStmAcc(pFileRead); + m_pDataAcc = new CXML_DataStmAcc(pFileRead); if (!m_pDataAcc) { return FALSE; } @@ -370,7 +370,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, return NULL; } CXML_Element* pElement; - pElement = FX_NEW CXML_Element; + pElement = new CXML_Element; if (pElement) { pElement->m_pParent = pParent; pElement->SetTag(tag_space, tag_name); @@ -523,7 +523,7 @@ void CXML_Parser::InsertContentSegment(FX_BOOL bCDATA, return; } CXML_Content* pContent; - pContent = FX_NEW CXML_Content; + pContent = new CXML_Content; if (!pContent) { return; } @@ -805,7 +805,7 @@ void CXML_AttrMap::SetAt(const CFX_ByteStringC& space, } } if (!m_pMap) { - m_pMap = FX_NEW CFX_ObjectArray<CXML_AttrItem>; + m_pMap = new CFX_ObjectArray<CXML_AttrItem>; } if (!m_pMap) { return; diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/src/fxcrt/fxcrt_platforms.cpp index 93f78c7f51..a9f22d00c6 100644 --- a/core/src/fxcrt/fxcrt_platforms.cpp +++ b/core/src/fxcrt/fxcrt_platforms.cpp @@ -12,7 +12,7 @@ _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_ && \ _FXM_PLATFORM_ != _FXM_PLATFORM_ANDROID_) IFXCRT_FileAccess* FXCRT_FileAccess_Create() { - return FX_NEW CFXCRT_FileAccess_CRT; + return new CFXCRT_FileAccess_CRT; } void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString& bsMode) { if (dwModes & FX_FILEMODE_ReadOnly) { diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/src/fxcrt/fxcrt_posix.cpp index 03fd345900..88e3d8af1d 100644 --- a/core/src/fxcrt/fxcrt_posix.cpp +++ b/core/src/fxcrt/fxcrt_posix.cpp @@ -11,7 +11,7 @@ _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \ _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ IFXCRT_FileAccess* FXCRT_FileAccess_Create() { - return FX_NEW CFXCRT_FileAccess_Posix; + return new CFXCRT_FileAccess_Posix; } void FXCRT_Posix_GetFileMode(FX_DWORD dwModes, int32_t& nFlags, diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp index 906e8bd937..86077019af 100644 --- a/core/src/fxcrt/fxcrt_windows.cpp +++ b/core/src/fxcrt/fxcrt_windows.cpp @@ -23,7 +23,7 @@ FX_BOOL FX_File_Exist(const CFX_WideStringC& fileName) { return (dwAttri & FILE_ATTRIBUTE_DIRECTORY) == 0; } IFXCRT_FileAccess* FXCRT_FileAccess_Create() { - return FX_NEW CFXCRT_FileAccess_Win64; + return new CFXCRT_FileAccess_Win64; } void FXCRT_Windows_GetFileMode(FX_DWORD dwMode, FX_DWORD& dwAccess, diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index 61447ba267..993f50afad 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -186,7 +186,7 @@ IFX_RenderDeviceDriver* IFX_RenderDeviceDriver::CreateFxgeDriver( FX_BOOL bRgbByteOrder, CFX_DIBitmap* pOriDevice, FX_BOOL bGroupKnockout) { - return FX_NEW CFX_AggDeviceDriver(pBitmap, 0, bRgbByteOrder, pOriDevice, + return new CFX_AggDeviceDriver(pBitmap, 0, bRgbByteOrder, pOriDevice, bGroupKnockout); } CFX_AggDeviceDriver::CFX_AggDeviceDriver(CFX_DIBitmap* pBitmap, @@ -266,7 +266,7 @@ int CFX_AggDeviceDriver::GetDeviceCaps(int caps_id) { void CFX_AggDeviceDriver::SaveState() { void* pClip = NULL; if (m_pClipRgn) { - pClip = FX_NEW CFX_ClipRgn(*m_pClipRgn); + pClip = new CFX_ClipRgn(*m_pClipRgn); if (!pClip) { return; } @@ -285,7 +285,7 @@ void CFX_AggDeviceDriver::RestoreState(FX_BOOL bKeepSaved) { m_pClipRgn = NULL; if (bKeepSaved) { if (pSavedClip) { - m_pClipRgn = FX_NEW CFX_ClipRgn(*pSavedClip); + m_pClipRgn = new CFX_ClipRgn(*pSavedClip); } } else { m_StateStack.RemoveAt(m_StateStack.GetSize() - 1); @@ -322,7 +322,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathFill( int fill_mode) { m_FillFlags = fill_mode; if (m_pClipRgn == NULL) { - m_pClipRgn = FX_NEW CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), + m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); if (!m_pClipRgn) { return FALSE; @@ -357,7 +357,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke( const CFX_AffineMatrix* pObject2Device, const CFX_GraphStateData* pGraphState) { if (m_pClipRgn == NULL) { - m_pClipRgn = FX_NEW CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), + m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); if (!m_pClipRgn) { return FALSE; @@ -1744,7 +1744,7 @@ FX_BOOL CFX_AggDeviceDriver::StartDIBits(const CFX_DIBSource* pSource, if (m_pBitmap->GetBuffer() == NULL) { return TRUE; } - CFX_ImageRenderer* pRenderer = FX_NEW CFX_ImageRenderer; + CFX_ImageRenderer* pRenderer = new CFX_ImageRenderer; if (!pRenderer) { return FALSE; } @@ -1777,7 +1777,7 @@ FX_BOOL CFX_FxgeDevice::Attach(CFX_DIBitmap* pBitmap, return FALSE; } SetBitmap(pBitmap); - IFX_RenderDeviceDriver* pDriver = FX_NEW CFX_AggDeviceDriver( + IFX_RenderDeviceDriver* pDriver = new CFX_AggDeviceDriver( pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); if (!pDriver) { return FALSE; @@ -1791,7 +1791,7 @@ FX_BOOL CFX_FxgeDevice::Create(int width, int dither_bits, CFX_DIBitmap* pOriDevice) { m_bOwnedBitmap = TRUE; - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap) { return FALSE; } @@ -1800,7 +1800,7 @@ FX_BOOL CFX_FxgeDevice::Create(int width, return FALSE; } SetBitmap(pBitmap); - IFX_RenderDeviceDriver* pDriver = FX_NEW CFX_AggDeviceDriver( + IFX_RenderDeviceDriver* pDriver = new CFX_AggDeviceDriver( pBitmap, dither_bits, FALSE, pOriDevice, FALSE); if (!pDriver) { return FALSE; diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 59fbcb5f58..303ba97709 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -332,7 +332,7 @@ IFPF_Font* CFPF_SkiaFontMgr::CreateFont(const CFX_ByteStringC& bsFamilyname, CFPF_SkiaFontDescriptor* pFontDes = (CFPF_SkiaFontDescriptor*)m_FontFaces.ElementAt(nItem); <<<<<<< HEAD - CFPF_SkiaFont* pFont = FX_NEW CFPF_SkiaFont; + CFPF_SkiaFont* pFont = new CFPF_SkiaFont; if (pFont) { if (pFont->InitFont(this, pFontDes, bsFamilyname, dwStyle, uCharset)) { m_FamilyFonts.SetAt((void*)(uintptr_t)dwHash, (void*)pFont); @@ -449,7 +449,7 @@ void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) { void CFPF_SkiaFontMgr::ScanFile(const CFX_ByteStringC& file) { FXFT_Face face = GetFontFace(file); if (face) { - CFPF_SkiaPathFont* pFontDesc = FX_NEW CFPF_SkiaPathFont; + CFPF_SkiaPathFont* pFontDesc = new CFPF_SkiaPathFont; if (!pFontDesc) { return; } diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index 98036a110a..a421a0e944 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -11,7 +11,7 @@ static IFPF_DeviceModule* gs_pPFModule = NULL; IFPF_DeviceModule* FPF_GetDeviceModule() { if (!gs_pPFModule) { - gs_pPFModule = FX_NEW CFPF_SkiaDeviceModule; + gs_pPFModule = new CFPF_SkiaDeviceModule; } return gs_pPFModule; } @@ -24,7 +24,7 @@ void CFPF_SkiaDeviceModule::Destroy() { } IFPF_FontMgr* CFPF_SkiaDeviceModule::GetFontMgr() { if (!m_pFontMgr) { - m_pFontMgr = FX_NEW CFPF_SkiaFontMgr; + m_pFontMgr = new CFPF_SkiaFontMgr; if (!m_pFontMgr) { return NULL; } diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp index 1927358983..43fe3b197f 100644 --- a/core/src/fxge/android/fx_android_imp.cpp +++ b/core/src/fxge/android/fx_android_imp.cpp @@ -13,7 +13,7 @@ void CFX_GEModule::InitPlatform() { } IFPF_FontMgr* pFontMgr = pDeviceModule->GetFontMgr(); if (pFontMgr) { - CFX_AndroidFontInfo* pFontInfo = FX_NEW CFX_AndroidFontInfo; + CFX_AndroidFontInfo* pFontInfo = new CFX_AndroidFontInfo; if (!pFontInfo) { return; } diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 9af8804d48..e08f6224d8 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -94,7 +94,7 @@ void* CFX_MacFontInfo::MapFont(int weight, return NULL; } IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { - CFX_MacFontInfo* pInfo = FX_NEW CFX_MacFontInfo; + CFX_MacFontInfo* pInfo = new CFX_MacFontInfo; if (!pInfo) { return NULL; } @@ -104,7 +104,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return pInfo; } void CFX_GEModule::InitPlatform() { - m_pPlatformData = FX_NEW CApplePlatform; + m_pPlatformData = new CApplePlatform; m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); } void CFX_GEModule::DestroyPlatform() { diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index 80b9517629..323b8eac3c 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -1024,7 +1024,7 @@ FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass) { m_pContext = context; CGContextRetain(m_pContext); IFX_RenderDeviceDriver* pDriver = - FX_NEW CFX_QuartzDeviceDriver(m_pContext, nDeviceClass); + new CFX_QuartzDeviceDriver(m_pContext, nDeviceClass); if (!pDriver) { return FALSE; } @@ -1038,7 +1038,7 @@ FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap) { return FALSE; } IFX_RenderDeviceDriver* pDriver = - FX_NEW CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY); + new CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY); if (!pDriver) { return FALSE; } @@ -1051,7 +1051,7 @@ FX_BOOL CFX_QuartzDevice::Create(int32_t width, if ((uint8_t)format < 32) { return FALSE; } - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap) { return FALSE; } diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index 52169b946d..950f72925a 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -1105,7 +1105,7 @@ CFX_DIBitmap* CFX_DIBSource::CloneConvert(FXDIB_Format dest_format, } return pClone; } - CFX_DIBitmap* pClone = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pClone = new CFX_DIBitmap; if (!pClone) { return NULL; } diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index 02e4dbcd42..86d495f28e 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -851,7 +851,7 @@ FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause) { #define MAX_PROGRESSIVE_STRETCH_PIXELS 1000000 FX_BOOL CFX_ImageStretcher::StartStretch() { m_pStretchEngine = - FX_NEW CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight, + new CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight, m_ClipRect, m_pSource, m_Flags); if (!m_pStretchEngine) { return FALSE; diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 2d6d217b46..ce55640cb3 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -161,7 +161,7 @@ CFX_DIBitmap* CFX_DIBSource::Clone(const FX_RECT* pClip) const { return NULL; } } - CFX_DIBitmap* pNewBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pNewBitmap = new CFX_DIBitmap; if (!pNewBitmap) { return NULL; } @@ -226,7 +226,7 @@ FX_BOOL CFX_DIBSource::BuildAlphaMask() { if (m_pAlphaMask) { return TRUE; } - m_pAlphaMask = FX_NEW CFX_DIBitmap; + m_pAlphaMask = new CFX_DIBitmap; if (!m_pAlphaMask) { return FALSE; } @@ -591,7 +591,7 @@ CFX_DIBitmap* CFX_DIBSource::GetAlphaMask(const FX_RECT* pClip) const { return NULL; } } - CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pMask = new CFX_DIBitmap; if (!pMask) { return NULL; } @@ -925,7 +925,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) { int b = (uint8_t)m_pPalette[i]; gray[i] = (uint8_t)FXRGB2GRAY(r, g, b); } - CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pMask = new CFX_DIBitmap; if (!pMask) { return FALSE; } @@ -959,7 +959,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) { int b = (uint8_t)m_pPalette[i]; gray[i] = (uint8_t)FXRGB2GRAY(r, g, b); } - CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pMask = new CFX_DIBitmap; if (!pMask) { return FALSE; } @@ -979,7 +979,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) { break; } case FXDIB_Rgb: { - CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pMask = new CFX_DIBitmap; if (!pMask) { return FALSE; } @@ -1000,7 +1000,7 @@ FX_BOOL CFX_DIBitmap::GetGrayData(void* pIccTransform) { break; } case FXDIB_Rgb32: { - CFX_DIBitmap* pMask = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pMask = new CFX_DIBitmap; if (!pMask) { return FALSE; } @@ -1443,7 +1443,7 @@ FX_BOOL CFX_DIBitmap::DitherFS(const FX_DWORD* pPalette, return TRUE; } CFX_DIBitmap* CFX_DIBSource::FlipImage(FX_BOOL bXFlip, FX_BOOL bYFlip) const { - CFX_DIBitmap* pFlipped = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pFlipped = new CFX_DIBitmap; if (!pFlipped) { return NULL; } @@ -1521,7 +1521,7 @@ CFX_DIBExtractor::CFX_DIBExtractor(const CFX_DIBSource* pSrc) { if (pSrc->GetBuffer() == NULL) { m_pBitmap = pSrc->Clone(); } else { - m_pBitmap = FX_NEW CFX_DIBitmap; + m_pBitmap = new CFX_DIBitmap; if (!m_pBitmap) { return; } @@ -1644,7 +1644,7 @@ FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice, return TRUE; } m_Status = 2; - m_pTransformer = FX_NEW CFX_ImageTransformer; + m_pTransformer = new CFX_ImageTransformer; if (!m_pTransformer) { return FALSE; } @@ -1752,7 +1752,7 @@ FX_BOOL CFX_BitmapStorer::SetInfo(int width, int height, FXDIB_Format src_format, FX_DWORD* pSrcPalette) { - m_pBitmap = FX_NEW CFX_DIBitmap; + m_pBitmap = new CFX_DIBitmap; if (!m_pBitmap) { return FALSE; } diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp index 35f8bfe8bc..cbf3bdc82c 100644 --- a/core/src/fxge/dib/fx_dib_transform.cpp +++ b/core/src/fxge/dib/fx_dib_transform.cpp @@ -77,7 +77,7 @@ CFX_DIBitmap* CFX_DIBSource::SwapXY(FX_BOOL bXFlip, if (dest_clip.IsEmpty()) { return NULL; } - CFX_DIBitmap* pTransBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pTransBitmap = new CFX_DIBitmap; if (!pTransBitmap) { return NULL; } @@ -422,7 +422,7 @@ FX_BOOL CFX_ImageTransformer::Continue(IFX_Pause* pPause) { stretch_buf_mask = m_Storer.GetBitmap()->m_pAlphaMask->GetBuffer(); } int stretch_pitch = m_Storer.GetBitmap()->GetPitch(); - CFX_DIBitmap* pTransformed = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pTransformed = new CFX_DIBitmap; if (!pTransformed) { return FALSE; } diff --git a/core/src/fxge/ge/fx_ge.cpp b/core/src/fxge/ge/fx_ge.cpp index b92e1ba773..607c9ee559 100644 --- a/core/src/fxge/ge/fx_ge.cpp +++ b/core/src/fxge/ge/fx_ge.cpp @@ -25,11 +25,11 @@ CFX_GEModule* CFX_GEModule::Get() { return g_pGEModule; } void CFX_GEModule::Create() { - g_pGEModule = FX_NEW CFX_GEModule; + g_pGEModule = new CFX_GEModule; if (!g_pGEModule) { return; } - g_pGEModule->m_pFontMgr = FX_NEW CFX_FontMgr; + g_pGEModule->m_pFontMgr = new CFX_FontMgr; g_pGEModule->InitPlatform(); g_pGEModule->SetTextGamma(2.2f); } @@ -42,7 +42,7 @@ void CFX_GEModule::Destroy() { } CFX_FontCache* CFX_GEModule::GetFontCache() { if (m_pFontCache == NULL) { - m_pFontCache = FX_NEW CFX_FontCache(); + m_pFontCache = new CFX_FontCache(); } return m_pFontCache; } diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index 36bbec0498..d428494913 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -34,7 +34,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) { } m_bLogic = TRUE; if (pFont->m_pSubstFont) { - m_pSubstFont = FX_NEW CFX_SubstFont; + m_pSubstFont = new CFX_SubstFont; if (!m_pSubstFont) { return FALSE; } @@ -102,7 +102,7 @@ FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, FX_BOOL bVertical) { m_bEmbedded = FALSE; m_bVertical = bVertical; - m_pSubstFont = FX_NEW CFX_SubstFont; + m_pSubstFont = new CFX_SubstFont; if (!m_pSubstFont) { return FALSE; } @@ -468,7 +468,7 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCodeEx(FX_DWORD charcode, } IFX_FontEncoding* FXGE_CreateUnicodeEncoding(CFX_Font* pFont) { CFX_UnicodeEncoding* pEncoding = NULL; - pEncoding = FX_NEW CFX_UnicodeEncoding(pFont); + pEncoding = new CFX_UnicodeEncoding(pFont); return pEncoding; } CFX_FontEncodingEX::CFX_FontEncodingEX() { @@ -603,7 +603,7 @@ static IFX_FontEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont, if (error) { return NULL; } - CFX_FontEncodingEX* pFontEncoding = FX_NEW CFX_FontEncodingEX; + CFX_FontEncodingEX* pFontEncoding = new CFX_FontEncodingEX; if (pFontEncoding && !pFontEncoding->Init(pFont, nEncodingID)) { delete pFontEncoding; pFontEncoding = NULL; diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index b3f6b7de73..2e591cd986 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -124,7 +124,7 @@ FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name, uint8_t* pData, FX_DWORD size, int face_index) { - CTTFontDesc* pFontDesc = FX_NEW CTTFontDesc; + CTTFontDesc* pFontDesc = new CTTFontDesc; if (!pFontDesc) { return NULL; } @@ -330,7 +330,7 @@ FXFT_Face CFX_FontMgr::AddCachedTTCFace(int ttc_size, int font_offset) { CFX_ByteString key; key.Format("%d:%d", ttc_size, checksum); - CTTFontDesc* pFontDesc = FX_NEW CTTFontDesc; + CTTFontDesc* pFontDesc = new CTTFontDesc; if (!pFontDesc) { return NULL; } @@ -1493,7 +1493,7 @@ void CFX_FolderFontInfo::ReportFace(CFX_ByteString& path, if (m_FontList.Lookup(facename, p)) { return; } - CFontFaceInfo* pInfo = FX_NEW CFontFaceInfo; + CFontFaceInfo* pInfo = new CFontFaceInfo; if (!pInfo) { return; } diff --git a/core/src/fxge/ge/fx_ge_linux.cpp b/core/src/fxge/ge/fx_ge_linux.cpp index c194adf3a1..cb8a0add76 100644 --- a/core/src/fxge/ge/fx_ge_linux.cpp +++ b/core/src/fxge/ge/fx_ge_linux.cpp @@ -228,7 +228,7 @@ void* CFX_LinuxFontInfo::FindFont(int weight, return pFind; } IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { - CFX_LinuxFontInfo* pInfo = FX_NEW CFX_LinuxFontInfo; + CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo; if (!pInfo) { return NULL; } diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp index 2e3af36527..5a97d5b18b 100644 --- a/core/src/fxge/ge/fx_ge_ps.cpp +++ b/core/src/fxge/ge/fx_ge_ps.cpp @@ -572,7 +572,7 @@ void CFX_PSRenderer::FindPSFontGlyph(CFX_FaceCache* pFaceCache, } if (m_PSFontList.GetSize() == 0 || m_PSFontList[m_PSFontList.GetSize() - 1]->m_nGlyphs == 256) { - CPSFont* pPSFont = FX_NEW CPSFont; + CPSFont* pPSFont = new CPSFont; if (!pPSFont) { return; } diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 5535eb247c..124ee7d88d 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -1226,7 +1226,7 @@ CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap( int anti_alias) { CFX_SizeGlyphCache* pSizeCache = NULL; if (!m_SizeMap.Lookup(FaceGlyphsKey, (void*&)pSizeCache)) { - pSizeCache = FX_NEW CFX_SizeGlyphCache; + pSizeCache = new CFX_SizeGlyphCache; if (pSizeCache == NULL) { return NULL; } @@ -1571,7 +1571,7 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont, return NULL; } int dib_width = bmwidth; - CFX_GlyphBitmap* pGlyphBitmap = FX_NEW CFX_GlyphBitmap; + CFX_GlyphBitmap* pGlyphBitmap = new CFX_GlyphBitmap; if (!pGlyphBitmap) { return NULL; } @@ -1923,7 +1923,7 @@ CFX_PathData* CFX_Font::LoadGlyphPath(FX_DWORD glyph_index, int dest_width) { if (params.m_PointCount == 0) { return NULL; } - CFX_PathData* pPath = FX_NEW CFX_PathData; + CFX_PathData* pPath = new CFX_PathData; if (!pPath) { return NULL; } diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index 8f98293673..a13c21889c 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -265,7 +265,7 @@ CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap, FX_BOOL bRgbByteOrder, CFX_DIBitmap* pOriDevice, FX_BOOL bGroupKnockout) { - m_pAggDriver = FX_NEW CFX_AggDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, + m_pAggDriver = new CFX_AggDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); } CFX_SkiaDeviceDriver::~CFX_SkiaDeviceDriver() { @@ -335,7 +335,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathFill( int fill_mode // fill mode, WINDING or ALTERNATE ) { if (m_pAggDriver->m_pClipRgn == NULL) - m_pAggDriver->m_pClipRgn = FX_NEW CFX_ClipRgn( + m_pAggDriver->m_pClipRgn = new CFX_ClipRgn( GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); if (pPathData->GetPointCount() == 5 || pPathData->GetPointCount() == 4) { @@ -372,7 +372,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathStroke( const CFX_GraphStateData* pGraphState // graphic state, for pen attributes ) { if (m_pAggDriver->m_pClipRgn == NULL) - m_pAggDriver->m_pClipRgn = FX_NEW CFX_ClipRgn( + m_pAggDriver->m_pClipRgn = new CFX_ClipRgn( GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); // build path data @@ -598,7 +598,7 @@ FX_BOOL CFX_SkiaDevice::Attach(CFX_DIBitmap* pBitmap, if (pBitmap == NULL) return FALSE; SetBitmap(pBitmap); - CFX_SkiaDeviceDriver* pDriver = FX_NEW CFX_SkiaDeviceDriver( + CFX_SkiaDeviceDriver* pDriver = new CFX_SkiaDeviceDriver( pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); SetDeviceDriver(pDriver); return TRUE; @@ -610,13 +610,13 @@ FX_BOOL CFX_SkiaDevice::Create(int width, int dither_bits, CFX_DIBitmap* pOriDevice) { m_bOwnedBitmap = TRUE; - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap->Create(width, height, format)) { delete pBitmap; return FALSE; } SetBitmap(pBitmap); - CFX_SkiaDeviceDriver* pDriver = FX_NEW CFX_SkiaDeviceDriver( + CFX_SkiaDeviceDriver* pDriver = new CFX_SkiaDeviceDriver( pBitmap, dither_bits, FALSE, pOriDevice, FALSE); SetDeviceDriver(pDriver); return TRUE; diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index d0d13b1018..295a6e94ca 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -405,7 +405,7 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return new CFX_Win32FontInfo; } void CFX_GEModule::InitPlatform() { - CWin32Platform* pPlatformData = FX_NEW CWin32Platform; + CWin32Platform* pPlatformData = new CWin32Platform; if (!pPlatformData) { return; } @@ -1251,7 +1251,7 @@ CFX_WindowsDevice::CFX_WindowsDevice(HDC hDC, m_bForcePSOutput = bForcePSOutput; m_psLevel = psLevel; if (bForcePSOutput) { - IFX_RenderDeviceDriver* pDriver = FX_NEW CPSPrinterDriver; + IFX_RenderDeviceDriver* pDriver = new CPSPrinterDriver; if (!pDriver) { return; } @@ -1280,9 +1280,9 @@ IFX_RenderDeviceDriver* CFX_WindowsDevice::CreateDriver(HDC hDC, device_class = FXDC_DISPLAY; } if (device_class == FXDC_PRINTER) { - return FX_NEW CGdiPrinterDriver(hDC); + return new CGdiPrinterDriver(hDC); } - return FX_NEW CGdiDisplayDriver(hDC); + return new CGdiDisplayDriver(hDC); } CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width, int height, @@ -1300,7 +1300,7 @@ CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width, if (m_hBitmap == NULL) { return; } - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap) { return; } @@ -1308,7 +1308,7 @@ CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width, SetBitmap(pBitmap); m_hDC = ::CreateCompatibleDC(NULL); m_hOldBitmap = (HBITMAP)SelectObject(m_hDC, m_hBitmap); - IFX_RenderDeviceDriver* pDriver = FX_NEW CGdiDisplayDriver(m_hDC); + IFX_RenderDeviceDriver* pDriver = new CGdiDisplayDriver(m_hDC); if (!pDriver) { return; } diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp index d7dd912d14..f6230f6ce0 100644 --- a/core/src/fxge/win32/fx_win32_dib.cpp +++ b/core/src/fxge/win32/fx_win32_dib.cpp @@ -59,7 +59,7 @@ CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi, bBottomUp = FALSE; } int pitch = (width * pbmi->bmiHeader.biBitCount + 31) / 32 * 4; - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap) { return NULL; } @@ -131,7 +131,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromFile(const FX_WCHAR* filename) { HDC hDC = CreateCompatibleDC(NULL); int width, height; GetBitmapSize(hBitmap, width, height); - CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap; if (!pDIBitmap) { DeleteDC(hDC); return NULL; @@ -168,7 +168,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args) { HDC hDC = CreateCompatibleDC(NULL); int width, height; GetBitmapSize(hBitmap, width, height); - CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap; if (!pDIBitmap) { DeleteDC(hDC); return NULL; @@ -204,7 +204,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromDDB(HDC hDC, int height = abs(bmih.biHeight); bmih.biHeight = -height; bmih.biCompression = BI_RGB; - CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pDIBitmap = new CFX_DIBitmap; if (!pDIBitmap) { return NULL; } diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index cf54e0ccaa..f4f6d91fbc 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -63,7 +63,7 @@ class CDwFontFileLoader final : public IDWriteFontFileLoader { static IDWriteFontFileLoader* GetLoader() { if (instance_ == NULL) { - instance_ = FX_NEW CDwFontFileLoader(); + instance_ = new CDwFontFileLoader(); return instance_; } return instance_; @@ -190,7 +190,7 @@ FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, goto failed; } *(CDwGdiTextRenderer**)renderTarget = - FX_NEW CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams); + new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams); if (*(CDwGdiTextRenderer**)renderTarget == NULL) { goto failed; } @@ -336,7 +336,7 @@ HRESULT STDMETHODCALLTYPE CDwFontFileLoader::CreateStreamFromKey( OUT IDWriteFontFileStream** fontFileStream) { *fontFileStream = NULL; CDwFontFileStream* stream = - FX_NEW CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize); + new CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize); if (stream == NULL) { return E_OUTOFMEMORY; } diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index bfaccc78bd..9dbc7b4289 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -475,7 +475,7 @@ static CFX_DIBitmap* _StretchMonoToGray(int dest_width, int result_width = pClipRect->Width(); int result_height = pClipRect->Height(); int result_pitch = (result_width + 3) / 4 * 4; - CFX_DIBitmap* pStretched = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pStretched = new CFX_DIBitmap; if (!pStretched) { return NULL; } @@ -1416,7 +1416,7 @@ static PREVIEW3_DIBITMAP* LoadDIBitmap(WINDIB_Open_Args_ args) { if (args.memory_size == 0 || !args.memory_base) { return NULL; } - pStream = FX_NEW GpStream; + pStream = new GpStream; if (!pStream) { return NULL; } diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index 1b3ba4eee5..aa8eefd1bb 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -169,7 +169,7 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, CPDF_FixedMatrix result2src_fix(result2src, 8); int result_width = result_rect.Width(); int result_height = result_rect.Height(); - CFX_DIBitmap* pTempBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pTempBitmap = new CFX_DIBitmap; if (!pTempBitmap) { if (pSrcBitmap != src_bitmap) { delete pSrcBitmap; @@ -325,7 +325,7 @@ FX_BOOL CPSPrinterDriver::Init(HDC hDC, int pslevel, FX_BOOL bCmykOutput) { m_Width = ::GetDeviceCaps(m_hDC, HORZRES); m_Height = ::GetDeviceCaps(m_hDC, VERTRES); m_nBitsPerPixel = ::GetDeviceCaps(m_hDC, BITSPIXEL); - m_pPSOutput = FX_NEW CPSOutput(hDC); + m_pPSOutput = new CPSOutput(hDC); if (!m_pPSOutput) { return FALSE; } diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 1e648e9461..40ac50489d 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -354,7 +354,7 @@ class CPDFDoc_Environment final { FPDF_LPFILEHANDLER fileHandler = m_pInfo->FFI_DownloadFromURL(m_pInfo, wsURL); - CFPDF_FileStream* fileStream = FX_NEW CFPDF_FileStream(fileHandler); + CFPDF_FileStream* fileStream = new CFPDF_FileStream(fileHandler); return fileStream; } return NULL; diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 3252602dbc..11471af9b7 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -190,8 +190,8 @@ void JSMethod(const char* method_name_string, const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name); \ void js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject obj, \ JSFXObject global) { \ - CJS_Object* pObj = FX_NEW js_class_name(obj); \ - pObj->SetEmbedObject(FX_NEW class_alternate(pObj)); \ + CJS_Object* pObj = new js_class_name(obj); \ + pObj->SetEmbedObject(new class_alternate(pObj)); \ JS_SetPrivate(NULL, obj, (void*)pObj); \ pObj->InitInstance(cc); \ } \ @@ -398,8 +398,8 @@ void JSSpecialPropDel(const char* class_name, } \ void js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject obj, \ JSFXObject global) { \ - CJS_Object* pObj = FX_NEW js_class_name(obj); \ - pObj->SetEmbedObject(FX_NEW class_alternate(pObj)); \ + CJS_Object* pObj = new js_class_name(obj); \ + pObj->SetEmbedObject(new class_alternate(pObj)); \ JS_SetPrivate(NULL, obj, (void*)pObj); \ pObj->InitInstance(cc); \ } \ diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index cb6d51939e..3a8853cb24 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -175,7 +175,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDict("AP"); if (pAPDict == NULL) { - pAPDict = FX_NEW CPDF_Dictionary; + pAPDict = new CPDF_Dictionary; m_pAnnotDict->SetAt("AP", pAPDict); } @@ -194,14 +194,14 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, CPDF_Dictionary* pStreamDict = pStream->GetDict(); if (!pStreamDict) { - pStreamDict = FX_NEW CPDF_Dictionary; + pStreamDict = new CPDF_Dictionary; pStream->InitStream(NULL, 0, pStreamDict); } if (pStreamDict) { CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources"); if (!pStreamResList) { - pStreamResList = FX_NEW CPDF_Dictionary(); + pStreamResList = new CPDF_Dictionary(); pStreamDict->SetAt("Resources", pStreamResList); } diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index 0d5602fcf0..4100fe2db9 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -72,7 +72,7 @@ class CFPDF_DataAvail { DLLEXPORT FPDF_AVAIL STDCALL FPDFAvail_Create(FX_FILEAVAIL* file_avail, FPDF_FILEACCESS* file) { - CFPDF_DataAvail* pAvail = FX_NEW CFPDF_DataAvail; + CFPDF_DataAvail* pAvail = new CFPDF_DataAvail; pAvail->m_FileAvail.Set(file_avail); pAvail->m_FileRead.Set(file); pAvail->m_pDataAvail = @@ -98,7 +98,7 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDFAvail_GetDocument(FPDF_AVAIL avail, FPDF_BYTESTRING password) { if (avail == NULL) return NULL; - CPDF_Parser* pParser = FX_NEW CPDF_Parser; + CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); FX_DWORD err_code = pParser->StartAsynParse( @@ -112,7 +112,7 @@ FPDFAvail_GetDocument(FPDF_AVAIL avail, FPDF_BYTESTRING password) { CheckUnSupportError(pParser->GetDocument(), FPDF_ERR_SUCCESS); CPDF_Document* pPDFDoc = pParser->GetDocument(); CPDFXFA_App* pApp = CPDFXFA_App::GetInstance(); - CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pApp); + CPDFXFA_Document* pDocument = new CPDFXFA_Document(pPDFDoc, pApp); return pDocument; } diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 5514b2b32b..e48c6ab706 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -37,7 +37,7 @@ FX_BOOL IsValiableRect(CPDF_Rect rect, CPDF_Rect rcPage) { FX_BOOL GetContentsRect(CPDF_Document* pDoc, CPDF_Dictionary* pDict, CPDF_RectArray* pRectArray) { - CPDF_Page* pPDFPage = FX_NEW CPDF_Page; + CPDF_Page* pPDFPage = new CPDF_Page; pPDFPage->Load(pDoc, pDict, FALSE); pPDFPage->ParseContent(); @@ -197,7 +197,7 @@ void SetPageContents(CFX_ByteString key, // Create a new contents dictionary if (!key.IsEmpty()) { CPDF_Stream* pNewContents = - FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary); + new CPDF_Stream(NULL, 0, new CPDF_Dictionary); if (!pNewContents) return; pPage->SetAtReference("Contents", pDocument, @@ -216,7 +216,7 @@ void SetPageContents(CFX_ByteString key, switch (iType) { case PDFOBJ_STREAM: { - pContentsArray = FX_NEW CPDF_Array; + pContentsArray = new CPDF_Array; CPDF_Stream* pContents = (CPDF_Stream*)pContentsObj; FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents); CPDF_StreamAcc acc; @@ -247,7 +247,7 @@ void SetPageContents(CFX_ByteString key, if (!key.IsEmpty()) { CPDF_Stream* pNewContents = - FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary); + new CPDF_Stream(NULL, 0, new CPDF_Dictionary); dwObjNum = pDocument->AddIndirectObject(pNewContents); pContentsArray->AddReference(pDocument, dwObjNum); @@ -365,38 +365,38 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { rcOriginalCB = rcOriginalMB; if (!rcOriginalMB.IsEmpty()) { - CPDF_Array* pMediaBox = FX_NEW CPDF_Array(); + CPDF_Array* pMediaBox = new CPDF_Array(); - pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.left)); - pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.bottom)); - pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.right)); - pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.top)); + pMediaBox->Add(new CPDF_Number(rcOriginalMB.left)); + pMediaBox->Add(new CPDF_Number(rcOriginalMB.bottom)); + pMediaBox->Add(new CPDF_Number(rcOriginalMB.right)); + pMediaBox->Add(new CPDF_Number(rcOriginalMB.top)); pPageDict->SetAt("MediaBox", pMediaBox); } if (!rcOriginalCB.IsEmpty()) { - CPDF_Array* pCropBox = FX_NEW CPDF_Array(); - pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.left)); - pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.bottom)); - pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.right)); - pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.top)); + CPDF_Array* pCropBox = new CPDF_Array(); + pCropBox->Add(new CPDF_Number(rcOriginalCB.left)); + pCropBox->Add(new CPDF_Number(rcOriginalCB.bottom)); + pCropBox->Add(new CPDF_Number(rcOriginalCB.right)); + pCropBox->Add(new CPDF_Number(rcOriginalCB.top)); pPageDict->SetAt("ArtBox", pCropBox); } CPDF_Dictionary* pRes = NULL; pRes = pPageDict->GetDict("Resources"); if (!pRes) { - pRes = FX_NEW CPDF_Dictionary; + pRes = new CPDF_Dictionary; pPageDict->SetAt("Resources", pRes); } CPDF_Stream* pNewXObject = - FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary); + new CPDF_Stream(NULL, 0, new CPDF_Dictionary); FX_DWORD dwObjNum = pDocument->AddIndirectObject(pNewXObject); CPDF_Dictionary* pPageXObject = pRes->GetDict("XObject"); if (!pPageXObject) { - pPageXObject = FX_NEW CPDF_Dictionary; + pPageXObject = new CPDF_Dictionary; pRes->SetAt("XObject", pPageXObject); } @@ -421,7 +421,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { if (!key.IsEmpty()) { pPageXObject->SetAtReference(key, pDocument, dwObjNum); CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict(); - pNewXORes = FX_NEW CPDF_Dictionary; + pNewXORes = new CPDF_Dictionary; pNewOXbjectDic->SetAt("Resources", pNewXORes); pNewOXbjectDic->SetAtName("Type", "XObject"); pNewOXbjectDic->SetAtName("Subtype", "Form"); @@ -497,7 +497,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { CPDF_Dictionary* pXObject = pNewXORes->GetDict("XObject"); if (!pXObject) { - pXObject = FX_NEW CPDF_Dictionary; + pXObject = new CPDF_Dictionary; pNewXORes->SetAt("XObject", pXObject); } diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 9167a77c46..65901f86f2 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -35,17 +35,17 @@ DLLEXPORT int STDCALL FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap, // FXMT_CSLOCK_OBJ(&pPage->m_PageLock); - CRenderContext* pContext = FX_NEW CRenderContext; + CRenderContext* pContext = new CRenderContext; pPage->SetPrivateData((void*)1, pContext, DropContext); #ifdef _SKIA_SUPPORT_ - pContext->m_pDevice = FX_NEW CFX_SkiaDevice; + pContext->m_pDevice = new CFX_SkiaDevice; if (flags & FPDF_REVERSE_BYTE_ORDER) ((CFX_SkiaDevice*)pContext->m_pDevice) ->Attach((CFX_DIBitmap*)bitmap, 0, TRUE); else ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap); #else - pContext->m_pDevice = FX_NEW CFX_FxgeDevice; + pContext->m_pDevice = new CFX_FxgeDevice; if (flags & FPDF_REVERSE_BYTE_ORDER) ((CFX_FxgeDevice*)pContext->m_pDevice) ->Attach((CFX_DIBitmap*)bitmap, 0, TRUE); diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index ad5f7fd37b..aa08f6843f 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -20,11 +20,11 @@ DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, if (!pPage) return; CPDF_Dictionary* pPageDict = pPage->m_pFormDict; - CPDF_Array* pMediaBoxArray = FX_NEW CPDF_Array; - pMediaBoxArray->Add(FX_NEW CPDF_Number(left)); - pMediaBoxArray->Add(FX_NEW CPDF_Number(bottom)); - pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(right))); - pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(top))); + CPDF_Array* pMediaBoxArray = new CPDF_Array; + pMediaBoxArray->Add(new CPDF_Number(left)); + pMediaBoxArray->Add(new CPDF_Number(bottom)); + pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(right))); + pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(top))); pPageDict->SetAt("MediaBox", pMediaBoxArray); } @@ -40,11 +40,11 @@ DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, if (!pPage) return; CPDF_Dictionary* pPageDict = pPage->m_pFormDict; - CPDF_Array* pCropBoxArray = FX_NEW CPDF_Array; - pCropBoxArray->Add(FX_NEW CPDF_Number(left)); - pCropBoxArray->Add(FX_NEW CPDF_Number(bottom)); - pCropBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(right))); - pCropBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(top))); + CPDF_Array* pCropBoxArray = new CPDF_Array; + pCropBoxArray->Add(new CPDF_Number(left)); + pCropBoxArray->Add(new CPDF_Number(bottom)); + pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(right))); + pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(top))); pPageDict->SetAt("CropBox", pCropBoxArray); } @@ -125,8 +125,8 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, if (!pContentObj) return FALSE; - CPDF_Dictionary* pDic = FX_NEW CPDF_Dictionary; - CPDF_Stream* pStream = FX_NEW CPDF_Stream(NULL, 0, pDic); + CPDF_Dictionary* pDic = new CPDF_Dictionary; + CPDF_Stream* pStream = new CPDF_Stream(NULL, 0, pDic); pStream->SetData(textBuf.GetBuffer(), textBuf.GetSize(), FALSE, FALSE); CPDF_Document* pDoc = pPage->m_pDocument; if (!pDoc) @@ -141,7 +141,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, CPDF_Array* pContentArray = NULL; if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pContentObj; - CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum()); + CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); pContentArray->AddReference(pDoc, pEndStream); @@ -152,12 +152,12 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, if (pDirectObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pDirectObj; CPDF_Reference* pRef = - FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum()); + new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); pContentArray->AddReference(pDoc, pEndStream); } else if (pDirectObj->GetType() == PDFOBJ_STREAM) { - pContentArray = FX_NEW CPDF_Array(); + pContentArray = new CPDF_Array(); pContentArray->AddReference(pDoc, pStream->GetObjNum()); pContentArray->AddReference(pDoc, pDirectObj->GetObjNum()); pContentArray->AddReference(pDoc, pEndStream); @@ -222,7 +222,7 @@ DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left, float bottom, float right, float top) { - CPDF_ClipPath* pNewClipPath = FX_NEW CPDF_ClipPath(); + CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath(); pNewClipPath->GetModify(); CPDF_Path Path; Path.GetModify(); @@ -304,8 +304,8 @@ DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, strClip << "W* n\n"; } } - CPDF_Dictionary* pDic = FX_NEW CPDF_Dictionary; - CPDF_Stream* pStream = FX_NEW CPDF_Stream(NULL, 0, pDic); + CPDF_Dictionary* pDic = new CPDF_Dictionary; + CPDF_Stream* pStream = new CPDF_Stream(NULL, 0, pDic); pStream->SetData(strClip.GetBuffer(), strClip.GetSize(), FALSE, FALSE); CPDF_Document* pDoc = pPage->m_pDocument; if (!pDoc) @@ -315,7 +315,7 @@ DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, CPDF_Array* pContentArray = NULL; if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pContentObj; - CPDF_Reference* pRef = FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum()); + CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); } else if (pContentObj && pContentObj->GetType() == PDFOBJ_REFERENCE) { @@ -325,11 +325,11 @@ DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, if (pDirectObj->GetType() == PDFOBJ_ARRAY) { pContentArray = (CPDF_Array*)pDirectObj; CPDF_Reference* pRef = - FX_NEW CPDF_Reference(pDoc, pStream->GetObjNum()); + new CPDF_Reference(pDoc, pStream->GetObjNum()); pContentArray->InsertAt(0, pRef); } else if (pDirectObj->GetType() == PDFOBJ_STREAM) { - pContentArray = FX_NEW CPDF_Array(); + pContentArray = new CPDF_Array(); pContentArray->AddReference(pDoc, pStream->GetObjNum()); pContentArray->AddReference(pDoc, pDirectObj->GetObjNum()); pPageDic->SetAtReference("Contents", pDoc, diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 4688e49412..0006094f1a 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -179,7 +179,7 @@ DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, CPDF_Document* pDoc = pPage->m_pDocument; CPDF_LinkList* pLinkList = (CPDF_LinkList*)pDoc->GetPrivateData(&THISMODULE); if (!pLinkList) { - pLinkList = FX_NEW CPDF_LinkList(pDoc); + pLinkList = new CPDF_LinkList(pDoc); pDoc->SetPrivateData(&THISMODULE, pLinkList, ReleaseLinkList); } return pLinkList->GetLinkAtPoint(pPage, (FX_FLOAT)x, (FX_FLOAT)y).GetDict(); diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index bfd9adea36..f839d2c791 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -13,9 +13,9 @@ DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { if (!document) return NULL; - CPDF_ImageObject* pImageObj = FX_NEW CPDF_ImageObject; + CPDF_ImageObject* pImageObj = new CPDF_ImageObject; CPDF_Image* pImg = - FX_NEW CPDF_Image(((CPDFXFA_Document*)document)->GetPDFDoc()); + new CPDF_Image(((CPDFXFA_Document*)document)->GetPDFDoc()); pImageObj->m_pImage = pImg; return pImageObj; } @@ -28,7 +28,7 @@ FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, if (!image_object || !fileAccess || !pages) return FALSE; - IFX_FileRead* pFile = FX_NEW CPDF_CustomAccess(fileAccess); + IFX_FileRead* pFile = new CPDF_CustomAccess(fileAccess); CPDF_ImageObject* pImgObj = (CPDF_ImageObject*)image_object; pImgObj->m_GeneralState.GetModify(); diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index a8447ce730..e158bee7e6 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -18,7 +18,7 @@ #endif DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument() { - CPDF_Document* pDoc = FX_NEW CPDF_Document; + CPDF_Document* pDoc = new CPDF_Document; if (!pDoc) return NULL; pDoc->CreateNewDoc(); @@ -42,11 +42,11 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument() { if (pInfoDict) { if (FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) pInfoDict->SetAt("CreationDate", new CPDF_String(DateStr)); - pInfoDict->SetAt("Creator", FX_NEW CPDF_String(L"PDFium")); + pInfoDict->SetAt("Creator", new CPDF_String(L"PDFium")); } CPDFXFA_App* pApp = CPDFXFA_App::GetInstance(); - CPDFXFA_Document* document = FX_NEW CPDFXFA_Document(pDoc, pApp); + CPDFXFA_Document* document = new CPDFXFA_Document(pDoc, pApp); return document; } @@ -79,22 +79,22 @@ DLLEXPORT FPDF_PAGE STDCALL FPDFPage_New(FPDF_DOCUMENT document, CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(page_index); if (!pPageDict) return NULL; - CPDF_Array* pMediaBoxArray = FX_NEW CPDF_Array; - pMediaBoxArray->Add(FX_NEW CPDF_Number(0)); - pMediaBoxArray->Add(FX_NEW CPDF_Number(0)); - pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(width))); - pMediaBoxArray->Add(FX_NEW CPDF_Number(FX_FLOAT(height))); + CPDF_Array* pMediaBoxArray = new CPDF_Array; + pMediaBoxArray->Add(new CPDF_Number(0)); + pMediaBoxArray->Add(new CPDF_Number(0)); + pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(width))); + pMediaBoxArray->Add(new CPDF_Number(FX_FLOAT(height))); pPageDict->SetAt("MediaBox", pMediaBoxArray); - pPageDict->SetAt("Rotate", FX_NEW CPDF_Number(0)); - pPageDict->SetAt("Resources", FX_NEW CPDF_Dictionary); + pPageDict->SetAt("Rotate", new CPDF_Number(0)); + pPageDict->SetAt("Resources", new CPDF_Dictionary); - // CPDF_Page* pPage = FX_NEW CPDF_Page; + // CPDF_Page* pPage = new CPDF_Page; // pPage->Load(pDoc,pPageDict); // pPage->ParseContent(); CPDFXFA_Page* pPage = - FX_NEW CPDFXFA_Page((CPDFXFA_Document*)document, page_index); + new CPDFXFA_Page((CPDFXFA_Document*)document, page_index); pPage->LoadPDFPage(pPageDict); return pPage; @@ -288,7 +288,7 @@ DLLEXPORT void STDCALL FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object, CPDF_PageObject* pPageObj = (CPDF_PageObject*)page_object; if (pPageObj == NULL) return; - // PDF_ImageObject* pImageObj = FX_NEW CPDF_ImageObject; + // PDF_ImageObject* pImageObj = new CPDF_ImageObject; CFX_AffineMatrix matrix((FX_FLOAT)a, (FX_FLOAT)b, (FX_FLOAT)c, (FX_FLOAT)d, (FX_FLOAT)e, (FX_FLOAT)f); pPageObj->Transform(matrix); @@ -345,5 +345,5 @@ DLLEXPORT void STDCALL FPDFPage_SetRotation(FPDF_PAGE page, int rotate) { CPDF_Dictionary* pDict = pPage->m_pFormDict; rotate %= 4; - pDict->SetAt("Rotate", FX_NEW CPDF_Number(rotate * 90)); + pDict->SetAt("Rotate", new CPDF_Number(rotate * 90)); } diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 369f9b4279..abb8026a7f 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -299,7 +299,7 @@ DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, options.m_BackColor = 0xffffff; } options.m_AddFlags = flags >> 8; - options.m_pOCContext = FX_NEW CPDF_OCContext(pPDFDoc); + options.m_pOCContext = new CPDF_OCContext(pPDFDoc); if (CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page)) pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options, &clip); @@ -496,7 +496,7 @@ FPDF_Widget_GetSpellCheckWords(FPDF_DOCUMENT document, if (pXFAMenuHander == NULL) return; - CFX_ByteStringArray* sSuggestWords = FX_NEW CFX_ByteStringArray; + CFX_ByteStringArray* sSuggestWords = new CFX_ByteStringArray; CFX_PointF ptPopup; ptPopup.x = x; ptPopup.y = y; diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 14f73095fa..f56cc442f0 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -171,12 +171,12 @@ FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument, pContext->UpdateChecksum((IFX_FileRead*)pDsfileWrite); pContext->FinishChecksum(); #endif - CPDF_Dictionary* pDataDict = FX_NEW CPDF_Dictionary; + CPDF_Dictionary* pDataDict = new CPDF_Dictionary; if (iDataSetsIndex != -1) { if (pDataSetsStream) pDataSetsStream->InitStream(pDsfileWrite, pDataDict); } else { - CPDF_Stream* pData = FX_NEW CPDF_Stream(NULL, 0, NULL); + CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL); pData->InitStream(pDsfileWrite, pDataDict); FX_DWORD AppStreamobjnum = pPDFDocument->AddIndirectObject(pData); CPDF_Reference* pRef = @@ -202,12 +202,12 @@ FX_BOOL _SaveXFADocumentData(CPDFXFA_Document* pDocument, CFX_WideStringC(L"form"), pfileWrite, pContext) && pfileWrite > 0) { - CPDF_Dictionary* pDataDict = FX_NEW CPDF_Dictionary; + CPDF_Dictionary* pDataDict = new CPDF_Dictionary; if (iFormIndex != -1) { if (pFormStream) pFormStream->InitStream(pfileWrite, pDataDict); } else { - CPDF_Stream* pData = FX_NEW CPDF_Stream(NULL, 0, NULL); + CPDF_Stream* pData = new CPDF_Stream(NULL, 0, NULL); pData->InitStream(pfileWrite, pDataDict); FX_DWORD AppStreamobjnum = pPDFDocument->AddIndirectObject(pData); CPDF_Reference* pRef = diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 38a51f9ce2..a308f1727d 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -261,7 +261,7 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, return NULL; CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); - CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider); + CPDFXFA_Document* pDocument = new CPDFXFA_Document(pPDFDoc, pProvider); return pDocument; } @@ -330,7 +330,7 @@ class CMemFile final : public IFX_FileRead { DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf, int size, FPDF_BYTESTRING password) { - CPDF_Parser* pParser = FX_NEW CPDF_Parser; + CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); CMemFile* pMemFile = new CMemFile((uint8_t*)data_buf, size); FX_DWORD err_code = pParser->StartParse(pMemFile); @@ -347,16 +347,16 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf, return NULL; CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); - CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider); + CPDFXFA_Document* pDocument = new CPDFXFA_Document(pPDFDoc, pProvider); return pDocument; } DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, FPDF_BYTESTRING password) { - CPDF_Parser* pParser = FX_NEW CPDF_Parser; + CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); - CPDF_CustomAccess* pFile = FX_NEW CPDF_CustomAccess(pFileAccess); + CPDF_CustomAccess* pFile = new CPDF_CustomAccess(pFileAccess); FX_DWORD err_code = pParser->StartParse(pFile); if (err_code) { delete pParser; @@ -371,7 +371,7 @@ FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, return NULL; CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance(); - CPDFXFA_Document* pDocument = FX_NEW CPDFXFA_Document(pPDFDoc, pProvider); + CPDFXFA_Document* pDocument = new CPDFXFA_Document(pPDFDoc, pProvider); return pDocument; } @@ -477,7 +477,7 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, if (!pPage) return; - CRenderContext* pContext = FX_NEW CRenderContext; + CRenderContext* pContext = new CRenderContext; pPage->SetPrivateData((void*)1, pContext, DropContext); #ifndef _WIN32_WCE @@ -485,18 +485,18 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FX_BOOL bBackgroundAlphaNeeded = FALSE; bBackgroundAlphaNeeded = pPage->BackgroundAlphaNeeded(); if (bBackgroundAlphaNeeded) { - pBitmap = FX_NEW CFX_DIBitmap; + pBitmap = new CFX_DIBitmap; pBitmap->Create(size_x, size_y, FXDIB_Argb); pBitmap->Clear(0x00ffffff); #ifdef _SKIA_SUPPORT_ - pContext->m_pDevice = FX_NEW CFX_SkiaDevice; + pContext->m_pDevice = new CFX_SkiaDevice; ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap); #else - pContext->m_pDevice = FX_NEW CFX_FxgeDevice; + pContext->m_pDevice = new CFX_FxgeDevice; ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap); #endif } else - pContext->m_pDevice = FX_NEW CFX_WindowsDevice(dc); + pContext->m_pDevice = new CFX_WindowsDevice(dc); FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y, rotate, flags, TRUE, NULL); @@ -506,7 +506,7 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, CFX_WindowsDevice WinDC(dc); if (WinDC.GetDeviceCaps(FXDC_DEVICE_CLASS) == FXDC_PRINTER) { - CFX_DIBitmap* pDst = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pDst = new CFX_DIBitmap; int pitch = pBitmap->GetPitch(); pDst->Create(size_x, size_y, FXDIB_Rgb32); FXSYS_memset(pDst->GetBuffer(), -1, pitch * size_y); @@ -639,10 +639,10 @@ DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, if (!pPage) return; - CRenderContext* pContext = FX_NEW CRenderContext; + CRenderContext* pContext = new CRenderContext; pPage->SetPrivateData((void*)1, pContext, DropContext); #ifdef _SKIA_SUPPORT_ - pContext->m_pDevice = FX_NEW CFX_SkiaDevice; + pContext->m_pDevice = new CFX_SkiaDevice; if (flags & FPDF_REVERSE_BYTE_ORDER) ((CFX_SkiaDevice*)pContext->m_pDevice) @@ -650,7 +650,7 @@ DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, else ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap); #else - pContext->m_pDevice = FX_NEW CFX_FxgeDevice; + pContext->m_pDevice = new CFX_FxgeDevice; if (flags & FPDF_REVERSE_BYTE_ORDER) ((CFX_FxgeDevice*)pContext->m_pDevice) @@ -856,18 +856,18 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, pContext->m_pDevice->SaveState(); pContext->m_pDevice->SetClip_Rect(&clip); - pContext->m_pContext = FX_NEW CPDF_RenderContext; + pContext->m_pContext = new CPDF_RenderContext; pContext->m_pContext->Create(pPage); pContext->m_pContext->AppendObjectList(pPage, &matrix); if (flags & FPDF_ANNOT) { - pContext->m_pAnnots = FX_NEW CPDF_AnnotList(pPage); + pContext->m_pAnnots = new CPDF_AnnotList(pPage); FX_BOOL bPrinting = pContext->m_pDevice->GetDeviceClass() != FXDC_DISPLAY; pContext->m_pAnnots->DisplayAnnots(pPage, pContext->m_pContext, bPrinting, &matrix, TRUE, NULL); } - pContext->m_pRenderer = FX_NEW CPDF_ProgressiveRenderer; + pContext->m_pRenderer = new CPDF_ProgressiveRenderer; pContext->m_pRenderer->Start(pContext->m_pContext, pContext->m_pDevice, pContext->m_pOptions, pause); if (bNeedToRestore) { diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index a53381876a..5a233aa92a 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -17,7 +17,7 @@ CPDFXFA_App* CPDFXFA_App::g_pApp = NULL; CPDFXFA_App* CPDFXFA_App::GetInstance() {
if (!g_pApp) {
- g_pApp = FX_NEW CPDFXFA_App();
+ g_pApp = new CPDFXFA_App();
}
return g_pApp;
}
@@ -551,6 +551,6 @@ IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() { CXFA_FWLAdapterTimerMgr* pAdapter = NULL;
CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
if (pEnv)
- pAdapter = FX_NEW CXFA_FWLAdapterTimerMgr(pEnv);
+ pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);
return pAdapter;
}
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 30be57e763..be3b235889 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -159,7 +159,7 @@ CPDFXFA_Page* CPDFXFA_Document::GetPage(int page_index) { }
if (!pPage) {
- pPage = FX_NEW CPDFXFA_Page(this, page_index);
+ pPage = new CPDFXFA_Page(this, page_index);
FX_BOOL bRet = pPage->LoadPage();
if (!bRet) {
delete pPage;
@@ -649,7 +649,7 @@ void CPDFXFA_Document::SetTitle(IXFA_Doc* hDoc, if (pInfoDict == NULL)
return;
- pInfoDict->SetAt("Title", FX_NEW CPDF_String(wsTitle));
+ pInfoDict->SetAt("Title", new CPDF_String(wsTitle));
}
void CPDFXFA_Document::ExportData(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFilePath,
@@ -767,7 +767,7 @@ content.GetLength()); }
CPDF_Stream* pStream = (CPDF_Stream*)pDirectObj;
- CPDF_StreamAcc* pAcc = FX_NEW CPDF_StreamAcc;
+ CPDF_StreamAcc* pAcc = new CPDF_StreamAcc;
pAcc->LoadAllData(pStream);
fileWrite.WriteBlock(pAcc->GetData(), fileWrite.GetSize(),
pAcc->GetSize());
@@ -998,7 +998,7 @@ IFX_FileRead* CPDFXFA_Document::OpenLinkedFile(IXFA_Doc* hDoc, if (pFileHandler == NULL)
return NULL;
- CFPDF_FileStream* pFileRead = FX_NEW CFPDF_FileStream(pFileHandler);
+ CFPDF_FileStream* pFileRead = new CFPDF_FileStream(pFileHandler);
return pFileRead;
}
FX_BOOL CPDFXFA_Document::_ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index f8fbbd4997..3197f2a5e7 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp @@ -51,7 +51,7 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage() { m_pPDFPage = NULL;
}
- m_pPDFPage = FX_NEW CPDF_Page;
+ m_pPDFPage = new CPDF_Page;
m_pPDFPage->Load(pPDFDoc, pDict);
m_pPDFPage->ParseContent();
return TRUE;
@@ -113,7 +113,7 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) { if (m_pPDFPage)
delete m_pPDFPage;
- m_pPDFPage = FX_NEW CPDF_Page();
+ m_pPDFPage = new CPDF_Page();
m_pPDFPage->Load(m_pDocument->GetPDFDoc(), pageDict);
m_pPDFPage->ParseContent();
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp index 3e1eedf8ea..9db36c3920 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp @@ -16,7 +16,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer* pTimer, FX_BOOL bImmediately /* = TRUE */) {
if (m_pEnv) {
uint32_t uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);
- CFWL_TimerInfo* pInfo = FX_NEW CFWL_TimerInfo;
+ CFWL_TimerInfo* pInfo = new CFWL_TimerInfo;
pInfo->uIDEvent = uIDEvent;
pInfo->pTimer = pTimer;
ms_timerArray.Add(pInfo);
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index 83cd49858b..126c7a7fdb 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -699,12 +699,12 @@ void CPDFSDK_BAAnnot::SetBorderWidth(int nWidth) { CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArray("Border"); if (pBorder) { - pBorder->SetAt(2, FX_NEW CPDF_Number(nWidth)); + pBorder->SetAt(2, new CPDF_Number(nWidth)); } else { CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDict("BS"); if (!pBSDict) { - pBSDict = FX_NEW CPDF_Dictionary; + pBSDict = new CPDF_Dictionary; m_pAnnot->GetAnnotDict()->SetAt("BS", pBSDict); } @@ -783,7 +783,7 @@ void CPDFSDK_BAAnnot::SetBorderDash(const CFX_IntArray& array) { m_pAnnot->GetAnnotDict()->SetAt("BS", pBSDict); } - CPDF_Array* pArray = FX_NEW CPDF_Array; + CPDF_Array* pArray = new CPDF_Array; for (int i = 0, sz = array.GetSize(); i < sz; i++) { pArray->AddInteger(array[i]); } @@ -880,7 +880,7 @@ void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, } else { CPDF_Dictionary* pAPTypeDict = pAPDict->GetDict(sAPType); if (!pAPTypeDict) { - pAPTypeDict = FX_NEW CPDF_Dictionary; + pAPTypeDict = new CPDF_Dictionary; pAPDict->SetAt(sAPType, pAPTypeDict); } @@ -893,7 +893,7 @@ void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, CPDF_Document* pDoc = m_pPageView->GetPDFDocument(); ASSERT(pDoc != NULL); - pStream = FX_NEW CPDF_Stream(NULL, 0, NULL); + pStream = new CPDF_Stream(NULL, 0, NULL); int32_t objnum = pDoc->AddIndirectObject(pStream); // pAPDict->SetAtReference(sAPType, pDoc, objnum); ASSERT(pParentDict != NULL); @@ -903,7 +903,7 @@ void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType, CPDF_Dictionary* pStreamDict = pStream->GetDict(); if (!pStreamDict) { - pStreamDict = FX_NEW CPDF_Dictionary; + pStreamDict = new CPDF_Dictionary; pStreamDict->SetAtName("Type", "XObject"); pStreamDict->SetAtName("Subtype", "Form"); pStreamDict->SetAtInteger("FormType", 1); diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 5c76149a0d..d06fcc0947 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -2013,12 +2013,12 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources"); if (!pStreamResList) { - pStreamResList = FX_NEW CPDF_Dictionary(); + pStreamResList = new CPDF_Dictionary(); pStreamDict->SetAt("Resources", pStreamResList); } if (pStreamResList) { - CPDF_Dictionary* pXObject = FX_NEW CPDF_Dictionary; + CPDF_Dictionary* pXObject = new CPDF_Dictionary; pXObject->SetAtReference(sImageAlias, pDoc, pImage); pStreamResList->SetAt("XObject", pXObject); } diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index 4c75f1a4ca..760702e588 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -85,10 +85,10 @@ int JS_DefineObj(IJS_Runtime* pJSRuntime, v8::HandleScope handle_scope(isolate); CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(g_embedderDataSlot); if (!pArray) { - pArray = FX_NEW CFX_PtrArray(); + pArray = new CFX_PtrArray(); isolate->SetData(g_embedderDataSlot, pArray); } - CJS_ObjDefintion* pObjDef = FX_NEW CJS_ObjDefintion( + CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion( isolate, sObjName, eObjType, pConstructor, pDestructor); pArray->Add(pObjDef); return pArray->GetSize() - 1; @@ -313,7 +313,7 @@ void JS_InitialRuntime(IJS_Runtime* pJSRuntime, // Document is set as global object, need to construct it first. CFX_WideString wsString(L"Document"); if (ws.Equal(wsString)) { - CJS_PrivateData* pPrivateData = FX_NEW CJS_PrivateData; + CJS_PrivateData* pPrivateData = new CJS_PrivateData; pPrivateData->ObjDefID = i; v8Context->Global() @@ -459,7 +459,7 @@ v8::Local<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, v8::Local<v8::Object> obj; if (!objTemp->NewInstance(context).ToLocal(&obj)) return v8::Local<v8::Object>(); - CJS_PrivateData* pPrivateData = FX_NEW CJS_PrivateData; + CJS_PrivateData* pPrivateData = new CJS_PrivateData; pPrivateData->ObjDefID = nObjDefnID; obj->SetAlignedPointerInInternalField(0, pPrivateData); diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index 65fc9a6bd1..06ddeeb2a2 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -31,7 +31,7 @@ void CPWL_FontMap::SetSystemHandler(IFX_SystemHandler* pSystemHandler) { CPDF_Document* CPWL_FontMap::GetDocument() { if (!m_pPDFDoc) { if (CPDF_ModuleMgr::Get()) { - m_pPDFDoc = FX_NEW CPDF_Document; + m_pPDFDoc = new CPDF_Document; m_pPDFDoc->CreateNewDoc(); } } diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index ceea8a6a2f..ee85b9630a 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -173,14 +173,14 @@ class CFWL_Message : public CFWL_Note { class classname : public CFWL_Message { \
public: \
classname() : CFWL_Message() {} \
- virtual CFWL_Note* Clone() { return FX_NEW classname(*this); } \
+ virtual CFWL_Note* Clone() { return new classname(*this); } \
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const { \
wsClass = L" ## classname ## "; \
return FWL_ERR_Succeeded; \
} \
virtual FX_DWORD GetClassID() const { return msghashcode; } \
virtual CFWL_Event* CloneToEvent() { \
- classname* pEvent = FX_NEW classname; \
+ classname* pEvent = new classname; \
pEvent->m_bIsEvent = TRUE; \
return (CFWL_Event*)pEvent; \
}
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index a6722e2041..81741a4cbb 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -30,7 +30,7 @@ IFDE_RenderDevice* IFDE_RenderDevice::Create(CFX_DIBitmap* pBitmap, if (pBitmap == NULL) {
return NULL;
}
- CFX_FxgeDevice* pDevice = FX_NEW CFX_FxgeDevice;
+ CFX_FxgeDevice* pDevice = new CFX_FxgeDevice;
if (pDevice == NULL) {
return NULL;
}
diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index 1af81ca9d3..d98b6eefa4 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -179,7 +179,7 @@ FX_BOOL CFDE_TxtEdtFieldFormatParser::Parse(const CFX_WideString& wsFormat) { i++;
}
FormatItem.nValCount = i - FormatItem.nValStart;
- FDE_LPTXTEDTFORMATITEM pFormatItem = FX_NEW FDE_TXTEDTFORMATITEM;
+ FDE_LPTXTEDTFORMATITEM pFormatItem = new FDE_TXTEDTFORMATITEM;
FXSYS_memcpy(pFormatItem, &FormatItem, sizeof(FDE_TXTEDTFORMATITEM));
m_ItemArr.Add(pFormatItem);
}
@@ -206,18 +206,18 @@ CFDE_TxtEdtField* CFDE_TxtEdtField::Create(const CFX_WideString& wsField, int32_t nIndex,
CFDE_TxtEdtBlock* pBlock) {
if (wsField[0] != L'%' || (wsField[0] == L'%' && wsField[1] == L'%')) {
- return FX_NEW CFDE_TxtEdtField_Fixed(wsField, nIndex, pBlock);
+ return new CFDE_TxtEdtField_Fixed(wsField, nIndex, pBlock);
}
FX_WCHAR wcType = wsField[wsField.GetLength() - 1];
switch (wcType) {
case L'd':
- return FX_NEW CFDE_TxtEdtField_Integer(wsField, nIndex, pBlock);
+ return new CFDE_TxtEdtField_Integer(wsField, nIndex, pBlock);
case L'f':
- return FX_NEW CFDE_TxtEdtField_Float(wsField, nIndex, pBlock);
+ return new CFDE_TxtEdtField_Float(wsField, nIndex, pBlock);
case L's':
- return FX_NEW CFDE_TxtEdtField_String(wsField, nIndex, pBlock);
+ return new CFDE_TxtEdtField_String(wsField, nIndex, pBlock);
case L'p':
- return FX_NEW CFDE_TxtEdtField_Password(wsField, nIndex, pBlock);
+ return new CFDE_TxtEdtField_Password(wsField, nIndex, pBlock);
default:
break;
}
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index 556b23c7b4..86ff1f3e1b 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -135,7 +135,7 @@ FX_BOOL CFDE_TxtEdtBufIter::IsEOF(FX_BOOL bTail) const { return bTail ? m_nIndex == (m_pBuf->GetTextLength() - 2) : m_nIndex == 0;
}
IFX_CharIter* CFDE_TxtEdtBufIter::Clone() {
- CFDE_TxtEdtBufIter* pIter = FX_NEW CFDE_TxtEdtBufIter(m_pBuf);
+ CFDE_TxtEdtBufIter* pIter = new CFDE_TxtEdtBufIter(m_pBuf);
pIter->m_nCurChunk = m_nCurChunk;
pIter->m_nCurIndex = m_nCurIndex;
pIter->m_nIndex = m_nIndex;
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 46561dc40c..b4f206245e 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -28,7 +28,7 @@ #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB
#endif
IFDE_TxtEdtEngine* IFDE_TxtEdtEngine::Create() {
- return FX_NEW CFDE_TxtEdtEngine();
+ return new CFDE_TxtEdtEngine();
}
CFDE_TxtEdtEngine::CFDE_TxtEdtEngine()
: m_nPageLineCount(20),
@@ -53,7 +53,7 @@ CFDE_TxtEdtEngine::CFDE_TxtEdtEngine() m_wLineEnd(FDE_UNICODE_PARAGRAPH_SPERATOR),
m_bAutoLineEnd(TRUE) {
FXSYS_memset(&m_rtCaret, 0, sizeof(CFX_RectF));
- m_pTxtBuf = FX_NEW CFDE_TxtEdtBuf();
+ m_pTxtBuf = new CFDE_TxtEdtBuf();
m_bAutoLineEnd = (m_Param.nLineEnd == FDE_TXTEDIT_LINEEND_Auto);
}
CFDE_TxtEdtEngine::~CFDE_TxtEdtEngine() {
@@ -486,7 +486,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, int32_t nNewCaret = nBgn + nCaret;
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
IFDE_TxtEdtDoRecord* pRecord =
- FX_NEW CFDE_TxtEdtDoRecord_FieldReplace(
+ new CFDE_TxtEdtDoRecord_FieldReplace(
this, m_nCaret, nNewCaret, pField, nIndexInField, nBgn,
wsDisplay.GetLength(), wsDel,
CFX_WideStringC(lpText, nLength), TRUE);
@@ -545,7 +545,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, }
Replace(nBgn, nEnd - nBgn + 1, wsDisplay);
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
- IFDE_TxtEdtDoRecord* pRecord = FX_NEW CFDE_TxtEdtDoRecord_FieldInsert(
+ IFDE_TxtEdtDoRecord* pRecord = new CFDE_TxtEdtDoRecord_FieldInsert(
this, m_nCaret, pField, m_nCaret - nBgn, nBgn, nEnd - nBgn + 1,
wsDisplay.GetLength(), CFX_WideStringC(lpText, nLength), FALSE);
CFX_ByteString bsDoRecord;
@@ -638,7 +638,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, }
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
IFDE_TxtEdtDoRecord* pRecord =
- FX_NEW CFDE_TxtEdtDoRecord_Insert(this, m_nCaret, lpBuffer, nLength);
+ new CFDE_TxtEdtDoRecord_Insert(this, m_nCaret, lpBuffer, nLength);
CFX_ByteString bsDoRecord;
pRecord->Serialize(bsDoRecord);
m_Param.pEventSink->On_AddDoRecord(this, bsDoRecord);
@@ -710,7 +710,7 @@ int32_t CFDE_TxtEdtEngine::Delete(int32_t nStart, FX_BOOL bBackspace) { pField->GetDisplayText(wsDisplay);
Replace(nBgn, nEnd - nBgn + 1, wsDisplay);
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
- IFDE_TxtEdtDoRecord* pRecord = FX_NEW CFDE_TxtEdtDoRecord_FieldDelete(
+ IFDE_TxtEdtDoRecord* pRecord = new CFDE_TxtEdtDoRecord_FieldDelete(
this, nStart, pField, nCaretInField, nBgn, nEnd - nBgn + 1,
wsDisplay.GetLength(), wsDel, FALSE);
CFX_ByteString bsDoRecord;
@@ -756,7 +756,7 @@ int32_t CFDE_TxtEdtEngine::Delete(int32_t nStart, FX_BOOL bBackspace) { CFX_WideString wsRange;
m_pTxtBuf->GetRange(wsRange, nStart, nCount);
IFDE_TxtEdtDoRecord* pRecord =
- FX_NEW CFDE_TxtEdtDoRecord_DeleteRange(this, nStart, m_nCaret, wsRange);
+ new CFDE_TxtEdtDoRecord_DeleteRange(this, nStart, m_nCaret, wsRange);
CFX_ByteString bsDoRecord;
pRecord->Serialize(bsDoRecord);
m_Param.pEventSink->On_AddDoRecord(this, bsDoRecord);
@@ -855,7 +855,7 @@ void CFDE_TxtEdtEngine::SetFormatBlock(int32_t nIndex, int32_t nBlockPos = -1;
FX_WCHAR wc;
CFDE_TxtEdtBufIter* pIter =
- FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
+ new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
pIter->SetAt(0);
do {
wc = pIter->GetChar();
@@ -880,7 +880,7 @@ void CFDE_TxtEdtEngine::SetFormatBlock(int32_t nIndex, nBlockPos = GetTextBufLength();
}
CFDE_TxtEdtBlock* pEditBlock =
- FX_NEW CFDE_TxtEdtBlock(this, wsBlockFormat, nIndex);
+ new CFDE_TxtEdtBlock(this, wsBlockFormat, nIndex);
m_BlockArray.InsertAt(m_BlockArray.GetSize(), pEditBlock);
CFX_WideString wsDisplay;
pEditBlock->GetDisplayText(wsDisplay);
@@ -948,7 +948,7 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) { }
int32_t nSize = m_SelRangePtrArr.GetSize();
if (nSize <= 0) {
- FDE_LPTXTEDTSELRANGE lpSelRange = FX_NEW FDE_TXTEDTSELRANGE;
+ FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE;
lpSelRange->nStart = nStart;
lpSelRange->nCount = nCount;
m_SelRangePtrArr.Add(lpSelRange);
@@ -958,7 +958,7 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) { FDE_LPTXTEDTSELRANGE lpTemp = NULL;
lpTemp = m_SelRangePtrArr[nSize - 1];
if (nStart >= lpTemp->nStart + lpTemp->nCount) {
- FDE_LPTXTEDTSELRANGE lpSelRange = FX_NEW FDE_TXTEDTSELRANGE;
+ FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE;
lpSelRange->nStart = nStart;
lpSelRange->nCount = nCount;
m_SelRangePtrArr.Add(lpSelRange);
@@ -993,7 +993,7 @@ void CFDE_TxtEdtEngine::AddSelRange(int32_t nStart, int32_t nCount) { }
}
if (nRangeCnt == 0) {
- FDE_LPTXTEDTSELRANGE lpSelRange = FX_NEW FDE_TXTEDTSELRANGE;
+ FDE_LPTXTEDTSELRANGE lpSelRange = new FDE_TXTEDTSELRANGE;
lpSelRange->nStart = nStart;
lpSelRange->nCount = nCount;
m_SelRangePtrArr.InsertAt(nRangeBgn, lpSelRange);
@@ -1131,7 +1131,7 @@ IFX_CharIter* CFDE_TxtEdtEngine::CreateCharIter() { if (!m_pTxtBuf) {
return NULL;
}
- return FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf);
+ return new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf);
}
int32_t CFDE_TxtEdtEngine::Line2Parag(int32_t nStartParag,
int32_t nStartLineofParag,
@@ -1231,7 +1231,7 @@ void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, nReserveCharStart += pParag->m_nCharCount;
bFirst = FALSE;
} else {
- pParag = FX_NEW CFDE_TxtEdtParag(this);
+ pParag = new CFDE_TxtEdtParag(this);
pParag->m_nLineCount = -1;
pParag->m_nCharCount = i - nTextStart + 1;
pParag->m_nCharStart = nReserveCharStart;
@@ -1246,7 +1246,7 @@ void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, pParag->m_nLineCount = -1;
bFirst = FALSE;
} else {
- pParag = FX_NEW CFDE_TxtEdtParag(this);
+ pParag = new CFDE_TxtEdtParag(this);
pParag->m_nLineCount = -1;
pParag->m_nCharCount = nLength - nTextStart + nCutPart;
pParag->m_nCharStart = nReserveCharStart;
@@ -1294,7 +1294,7 @@ void CFDE_TxtEdtEngine::RawInsert(int32_t nStart, nReserveCharStart += pParag->m_nCharCount;
bFirst = FALSE;
} else {
- pParag = FX_NEW CFDE_TxtEdtParag(this);
+ pParag = new CFDE_TxtEdtParag(this);
pParag->m_nLineCount = -1;
pParag->m_nCharCount = i - nTextStart + 1;
pParag->m_nCharStart = nReserveCharStart;
@@ -1309,7 +1309,7 @@ void CFDE_TxtEdtEngine::RawInsert(int32_t nStart, pParag->m_nLineCount = -1;
bFirst = FALSE;
} else {
- pParag = FX_NEW CFDE_TxtEdtParag(this);
+ pParag = new CFDE_TxtEdtParag(this);
pParag->m_nLineCount = -1;
pParag->m_nCharCount = nLength - nTextStart + nCutPart;
pParag->m_nCharStart = nReserveCharStart;
@@ -1390,7 +1390,7 @@ void CFDE_TxtEdtEngine::DeleteRange_DoRecord(int32_t nStart, if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
CFX_WideString wsRange;
m_pTxtBuf->GetRange(wsRange, nStart, nCount);
- IFDE_TxtEdtDoRecord* pRecord = FX_NEW CFDE_TxtEdtDoRecord_DeleteRange(
+ IFDE_TxtEdtDoRecord* pRecord = new CFDE_TxtEdtDoRecord_DeleteRange(
this, nStart, m_nCaret, wsRange, bSel);
CFX_ByteString bsDoRecord;
pRecord->Serialize(bsDoRecord);
@@ -1417,13 +1417,13 @@ void CFDE_TxtEdtEngine::RebuildParagraphs() { int32_t nCount = m_pTxtBuf->GetTextLength();
int32_t nIndex = 0;
CFDE_TxtEdtParag* pParag = NULL;
- IFX_CharIter* pIter = FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf);
+ IFX_CharIter* pIter = new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf);
pIter->SetAt(0);
do {
wChar = pIter->GetChar();
nIndex = pIter->GetAt();
if (wChar == m_wLineEnd) {
- CFDE_TxtEdtParag* pParag = FX_NEW CFDE_TxtEdtParag(this);
+ CFDE_TxtEdtParag* pParag = new CFDE_TxtEdtParag(this);
pParag->m_nCharStart = nParagStart;
pParag->m_nCharCount = nIndex - nParagStart + 1;
pParag->m_nLineCount = -1;
@@ -2073,7 +2073,7 @@ FX_BOOL CFDE_TxtEdtEngine::GetFieldBoundary(int32_t nIndex, int32_t& nEnd,
CFDE_TxtEdtField*& pField) {
CFDE_TxtEdtBufIter* pIter =
- FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
+ new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
pIter->SetAt(nIndex);
FX_BOOL bFind = FALSE;
do {
@@ -2126,7 +2126,7 @@ FX_BOOL CFDE_TxtEdtEngine::FindEditableField(int32_t nIndex, wcSecond = FDE_TXTEDT_FORMATBLOCK_BGN;
}
CFDE_TxtEdtBufIter* pIter =
- FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
+ new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
pIter->SetAt(nIndex);
int32_t bFind = FALSE;
do {
@@ -2196,7 +2196,7 @@ FX_BOOL CFDE_TxtEdtEngine::Move2NextEditableField(int32_t nIndex, }
int32_t CFDE_TxtEdtEngine::GetRealIndex(int32_t nIndex) const {
CFDE_TxtEdtBufIter* pIter =
- FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
+ new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)m_pTxtBuf, FALSE);
pIter->SetAt(0);
FX_BOOL bInField = FALSE;
int32_t nFieldBgn = 0;
@@ -2383,7 +2383,7 @@ void CFDE_TxtEdtEngine::DeleteSelect() { pField->GetDisplayText(wsDisplay);
Replace(nBgn, nEnd - nBgn + 1, wsDisplay);
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_NoRedoUndo)) {
- IFDE_TxtEdtDoRecord* pRecord = FX_NEW CFDE_TxtEdtDoRecord_FieldDelete(
+ IFDE_TxtEdtDoRecord* pRecord = new CFDE_TxtEdtDoRecord_FieldDelete(
this, nSelStart, pField, nCaretInField, nBgn, nEnd - nBgn + 1,
wsDisplay.GetLength(), wsDel, FALSE);
CFX_ByteString bsDoRecord;
@@ -2417,16 +2417,16 @@ IFDE_TxtEdtDoRecord* IFDE_TxtEdtDoRecord::Create( int32_t nType = *((int32_t*)lpBuf);
switch (nType) {
case FDE_TXTEDT_DORECORD_INS:
- return FX_NEW CFDE_TxtEdtDoRecord_Insert(bsDoRecord);
+ return new CFDE_TxtEdtDoRecord_Insert(bsDoRecord);
case FDE_TXTEDT_DORECORD_DEL:
- return FX_NEW CFDE_TxtEdtDoRecord_DeleteRange(bsDoRecord);
+ return new CFDE_TxtEdtDoRecord_DeleteRange(bsDoRecord);
#ifdef FDE_USEFORMATBLOCK
case FDE_TXTEDT_DORECORD_FORMATINS:
- return FX_NEW CFDE_TxtEdtDoRecord_FieldInsert(bsDoRecord);
+ return new CFDE_TxtEdtDoRecord_FieldInsert(bsDoRecord);
case FDE_TXTEDT_DORECORD_FORMATDEL:
- return FX_NEW CFDE_TxtEdtDoRecord_FieldDelete(bsDoRecord);
+ return new CFDE_TxtEdtDoRecord_FieldDelete(bsDoRecord);
case FDE_TXTEDT_DORECORD_FORMATREP:
- return FX_NEW CFDE_TxtEdtDoRecord_FieldReplace(bsDoRecord);
+ return new CFDE_TxtEdtDoRecord_FieldReplace(bsDoRecord);
#endif
default:
break;
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index a8e91426f1..cc1013e962 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -16,7 +16,7 @@ #define FDE_TXTEDT_TOLERANCE 0.1f
IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine,
int32_t nIndex) {
- return (IFDE_TxtEdtPage*)FX_NEW CFDE_TxtEdtPage(pEngine, nIndex);
+ return (IFDE_TxtEdtPage*)new CFDE_TxtEdtPage(pEngine, nIndex);
}
CFDE_TxtEdtTextSet::CFDE_TxtEdtTextSet(CFDE_TxtEdtPage* pPage)
: m_pPage(pPage) {}
@@ -368,7 +368,7 @@ int32_t CFDE_TxtEdtPage::SelectWord(const CFX_PointF& fPoint, int32_t& nCount) { return -1;
}
IFX_WordBreak* pIter = FX_WordBreak_Create();
- pIter->Attach(FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pBuf));
+ pIter->Attach(new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pBuf));
pIter->SetAt(nIndex);
nCount = pIter->GetWordLength();
int32_t nRet = pIter->GetWordPos();
@@ -392,7 +392,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(FX_LPCRECTF pClipBox, IFX_Pause* pPause) { if (pParams->dwMode & FDE_TEXTEDITMODE_Password) {
wcAlias = m_pEditEngine->GetAliasChar();
}
- m_pIter = FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pBuf, wcAlias);
+ m_pIter = new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pBuf, wcAlias);
IFX_TxtBreak* pBreak = m_pEditEngine->GetTextBreak();
pBreak->EndBreak(FX_TXTBREAK_ParagraphBreak);
pBreak->ClearBreakPieces();
@@ -425,7 +425,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(FX_LPCRECTF pClipBox, IFX_Pause* pPause) { (bVertial && bLineReserve) ? (-pParams->fLineSpace) : pParams->fLineSpace;
FX_FLOAT fLinePos = fLineStart;
if (m_pTextSet == NULL) {
- m_pTextSet = FX_NEW CFDE_TxtEdtTextSet(this);
+ m_pTextSet = new CFDE_TxtEdtTextSet(this);
}
m_PieceMassArr.RemoveAll(TRUE);
FX_DWORD dwBreakStatus = FX_TXTBREAK_None;
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index 561aa2f502..9c9f5b10cd 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -37,7 +37,7 @@ void CFDE_TxtEdtParag::LoadParag() { wcAlias = m_pEngine->GetAliasChar();
}
IFX_CharIter* pIter =
- FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pTxtBuf, wcAlias);
+ new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pTxtBuf, wcAlias);
pIter->SetAt(m_nCharStart);
int32_t nEndIndex = m_nCharStart + m_nCharCount;
CFX_ArrayTemplate<int32_t> LineBaseArr;
@@ -102,7 +102,7 @@ void CFDE_TxtEdtParag::UnloadParag() { void CFDE_TxtEdtParag::CalcLines() {
IFX_TxtBreak* pTxtBreak = m_pEngine->GetTextBreak();
IFDE_TxtEdtBuf* pTxtBuf = m_pEngine->GetTextBuf();
- IFX_CharIter* pIter = FX_NEW CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pTxtBuf);
+ IFX_CharIter* pIter = new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pTxtBuf);
int32_t nCount = 0;
FX_DWORD dwBreakStatus = FX_TXTBREAK_None;
int32_t nEndIndex = m_nCharStart + m_nCharCount;
diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 6909bb722f..0fdf810301 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -10,7 +10,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, FX_DWORD dwAccess,
int32_t iFileSize,
FX_BOOL bReleaseBufferRead) {
- CFX_Stream* pSR = FX_NEW CFX_Stream;
+ CFX_Stream* pSR = new CFX_Stream;
if (!pSR) {
return NULL;
}
@@ -20,7 +20,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (!pTR) {
pTR->Release();
pTR = NULL;
@@ -31,7 +31,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, }
IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead,
FX_DWORD dwAccess) {
- CFX_Stream* pSR = FX_NEW CFX_Stream;
+ CFX_Stream* pSR = new CFX_Stream;
if (pSR == NULL) {
return NULL;
}
@@ -40,7 +40,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (pTR == NULL) {
pSR->Release();
return NULL;
@@ -51,7 +51,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead, }
IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite,
FX_DWORD dwAccess) {
- CFX_Stream* pSR = FX_NEW CFX_Stream;
+ CFX_Stream* pSR = new CFX_Stream;
if (pSR == NULL) {
return NULL;
}
@@ -60,7 +60,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (pTR == NULL) {
pSR->Release();
return NULL;
@@ -71,7 +71,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite, }
IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName,
FX_DWORD dwAccess) {
- CFX_Stream* pSR = FX_NEW CFX_Stream;
+ CFX_Stream* pSR = new CFX_Stream;
if (pSR == NULL) {
return NULL;
}
@@ -80,7 +80,7 @@ IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (pTR == NULL) {
pSR->Release();
return NULL;
@@ -92,7 +92,7 @@ IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName, IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData,
int32_t length,
FX_DWORD dwAccess) {
- CFX_Stream* pSR = FX_NEW CFX_Stream;
+ CFX_Stream* pSR = new CFX_Stream;
if (pSR == NULL) {
return NULL;
}
@@ -101,7 +101,7 @@ IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (pTR == NULL) {
pSR->Release();
return NULL;
@@ -661,7 +661,7 @@ int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr, IFX_Stream* IFX_Stream::CreateTextStream(IFX_Stream* pBaseStream,
FX_BOOL bDeleteOnRelease) {
FXSYS_assert(pBaseStream != NULL);
- return FX_NEW CFX_TextStream(pBaseStream, bDeleteOnRelease);
+ return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
}
CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream)
: m_wCodePage(FX_CODEPAGE_DefANSI),
@@ -778,7 +778,7 @@ IFX_Stream* CFX_TextStream::CreateSharedStream(FX_DWORD dwAccess, return NULL;
}
if (dwAccess & FX_STREAMACCESS_Text) {
- IFX_Stream* pTR = FX_NEW CFX_TextStream(pSR, TRUE);
+ IFX_Stream* pTR = new CFX_TextStream(pSR, TRUE);
if (pTR == NULL) {
pSR->Release();
return NULL;
@@ -900,7 +900,7 @@ FX_BOOL CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, if (pszSrcFileName == NULL || FXSYS_wcslen(pszSrcFileName) < 1) {
return FALSE;
}
- m_pStreamImp = FX_NEW CFX_FileStreamImp();
+ m_pStreamImp = new CFX_FileStreamImp();
if (m_pStreamImp == NULL) {
return FALSE;
}
@@ -923,7 +923,7 @@ FX_BOOL CFX_Stream::LoadFileRead(IFX_FileRead* pFileRead, FX_DWORD dwAccess) { if (pFileRead == NULL) {
return FALSE;
}
- m_pStreamImp = FX_NEW CFX_FileReadStreamImp();
+ m_pStreamImp = new CFX_FileReadStreamImp();
if (m_pStreamImp == NULL) {
return FALSE;
}
@@ -947,7 +947,7 @@ FX_BOOL CFX_Stream::LoadFileWrite(IFX_FileWrite* pFileWrite, if (pFileWrite == NULL) {
return FALSE;
}
- m_pStreamImp = FX_NEW CFX_FileWriteStreamImp();
+ m_pStreamImp = new CFX_FileWriteStreamImp();
if (m_pStreamImp == NULL) {
return FALSE;
}
@@ -972,7 +972,7 @@ FX_BOOL CFX_Stream::LoadBuffer(uint8_t* pData, if (pData == NULL || iTotalSize < 1) {
return FALSE;
}
- m_pStreamImp = FX_NEW CFX_BufferStreamImp();
+ m_pStreamImp = new CFX_BufferStreamImp();
if (m_pStreamImp == NULL) {
return FALSE;
}
@@ -998,7 +998,7 @@ FX_BOOL CFX_Stream::LoadBufferRead(IFX_BufferRead* pBufferRead, if (!pBufferRead) {
return FALSE;
}
- m_pStreamImp = FX_NEW CFX_BufferReadStreamImp;
+ m_pStreamImp = new CFX_BufferReadStreamImp;
if (m_pStreamImp == NULL) {
return FALSE;
}
@@ -1244,7 +1244,7 @@ IFX_Stream* CFX_Stream::CreateSharedStream(FX_DWORD dwAccess, if (iEnd < iStart || iEnd > iTotal) {
return NULL;
}
- CFX_Stream* pShared = FX_NEW CFX_Stream;
+ CFX_Stream* pShared = new CFX_Stream;
if (pShared == NULL) {
return NULL;
}
@@ -1263,7 +1263,7 @@ IFX_Stream* CFX_Stream::CreateSharedStream(FX_DWORD dwAccess, IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
FX_BOOL bReleaseStream) {
FXSYS_assert(pBaseStream != NULL);
- return FX_NEW CFGAS_FileRead(pBaseStream, bReleaseStream);
+ return new CFGAS_FileRead(pBaseStream, bReleaseStream);
}
#ifdef FX_FILESIZE
CFGAS_FileRead::CFGAS_FileRead(IFX_Stream* pStream, FX_BOOL bReleaseStream)
@@ -1317,7 +1317,7 @@ IFX_FileRead* FX_CreateFileRead(IFX_BufferRead* pBufferRead, if (!pBufferRead) {
return NULL;
}
- return FX_NEW CFX_BufferAccImp(pBufferRead, iFileSize, bReleaseStream);
+ return new CFX_BufferAccImp(pBufferRead, iFileSize, bReleaseStream);
}
CFX_BufferAccImp::CFX_BufferAccImp(IFX_BufferRead* pBufferRead,
FX_FILESIZE iFileSize,
@@ -1410,7 +1410,7 @@ IFX_FileRead* FX_CreateFileRead(IFX_BufferRead* pBufferRead, if (!pBufferRead) {
return NULL;
}
- return FX_NEW CFX_BufferAccImp(pBufferRead, iFileSize, bReleaseStream);
+ return new CFX_BufferAccImp(pBufferRead, iFileSize, bReleaseStream);
}
CFX_BufferAccImp::CFX_BufferAccImp(IFX_BufferRead* pBufferRead,
int32_t iFileSize,
@@ -1500,7 +1500,7 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer, IFX_FileWrite* FX_CreateFileWrite(IFX_Stream* pBaseStream,
FX_BOOL bReleaseStream) {
FXSYS_assert(pBaseStream != NULL);
- return FX_NEW CFGAS_FileWrite(pBaseStream, bReleaseStream);
+ return new CFGAS_FileWrite(pBaseStream, bReleaseStream);
}
#ifdef FX_FILESIZE
CFGAS_FileWrite::CFGAS_FileWrite(IFX_Stream* pStream, FX_BOOL bReleaseStream)
diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 076cd4d5a8..1b5cb6d587 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -145,7 +145,7 @@ CFX_BaseMassArrayImp::CFX_BaseMassArrayImp(int32_t iChunkSize, m_iChunkCount(0),
m_iBlockCount(0) {
FXSYS_assert(m_iChunkSize > 0 && m_iBlockSize > 0);
- m_pData = FX_NEW CFX_PtrArray;
+ m_pData = new CFX_PtrArray;
m_pData->SetSize(16);
}
CFX_BaseMassArrayImp::~CFX_BaseMassArrayImp() {
@@ -337,7 +337,7 @@ CFX_BaseDiscreteArray::CFX_BaseDiscreteArray(int32_t iChunkSize, int32_t iBlockSize) {
FXSYS_assert(iChunkSize > 0 && iBlockSize > 0);
FX_LPBASEDISCRETEARRAYDATA pData;
- m_pData = pData = FX_NEW FX_BASEDISCRETEARRAYDATA;
+ m_pData = pData = new FX_BASEDISCRETEARRAYDATA;
pData->ChunkBuffer.SetSize(16);
pData->iChunkCount = 0;
pData->iChunkSize = iChunkSize;
diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp index 14bd24e3f0..fe02a049ad 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.cpp +++ b/xfa/src/fgas/src/font/fx_gdifont.cpp @@ -46,7 +46,7 @@ IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles,
FX_WORD wCodePage,
IFX_FontMgr* pFontMgr) {
- CFX_GdiFont* pFont = FX_NEW CFX_GdiFont(pFontMgr);
+ CFX_GdiFont* pFont = new CFX_GdiFont(pFontMgr);
if (!pFont->LoadFont(pszFontFamily, dwFontStyles, wCodePage)) {
pFont->Release();
return NULL;
@@ -56,7 +56,7 @@ IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, IFX_Font* IFX_Font::LoadFont(const uint8_t* pBuffer,
int32_t iLength,
IFX_FontMgr* pFontMgr) {
- CFX_GdiFont* pFont = FX_NEW CFX_GdiFont(pFontMgr);
+ CFX_GdiFont* pFont = new CFX_GdiFont(pFontMgr);
if (!pFont->LoadFont(pBuffer, iLength)) {
pFont->Release();
return NULL;
@@ -65,7 +65,7 @@ IFX_Font* IFX_Font::LoadFont(const uint8_t* pBuffer, }
IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFileName,
IFX_FontMgr* pFontMgr) {
- CFX_GdiFont* pFont = FX_NEW CFX_GdiFont(pFontMgr);
+ CFX_GdiFont* pFont = new CFX_GdiFont(pFontMgr);
if (!pFont->LoadFont(pszFileName)) {
pFont->Release();
return NULL;
@@ -75,7 +75,7 @@ IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFileName, IFX_Font* IFX_Font::LoadFont(IFX_Stream* pFontStream,
IFX_FontMgr* pFontMgr,
FX_BOOL bSaveStream) {
- CFX_GdiFont* pFont = FX_NEW CFX_GdiFont(pFontMgr);
+ CFX_GdiFont* pFont = new CFX_GdiFont(pFontMgr);
if (!pFont->LoadFont(pFontStream)) {
pFont->Release();
return NULL;
@@ -491,7 +491,7 @@ FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, ::GetGlyphOutlineW(m_hDC, iGlyphIndex, uFormat, &gm, dwGlyphSize,
pGlyphOutline, pMatrix);
if (pCache == NULL) {
- pCache = FX_NEW CFX_GdiFontCache;
+ pCache = new CFX_GdiFontCache;
if (m_FontCache.GetCount() >= FX_GDIFONT_FONTCACHESIZE) {
ClearCache();
}
diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index ef5ae4e1c5..8c81f9a8e5 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -18,7 +18,7 @@ IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, }
return NULL;
#else
- CFX_GEFont* pFont = FX_NEW CFX_GEFont(pFontMgr);
+ CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
if (!pFont->LoadFont(pszFontFamily, dwFontStyles, wCodePage)) {
pFont->Release();
return NULL;
@@ -35,7 +35,7 @@ IFX_Font* IFX_Font::LoadFont(const uint8_t* pBuffer, }
return NULL;
#else
- CFX_GEFont* pFont = FX_NEW CFX_GEFont(pFontMgr);
+ CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
if (!pFont->LoadFont(pBuffer, iLength)) {
pFont->Release();
return NULL;
@@ -51,7 +51,7 @@ IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFileName, }
return NULL;
#else
- CFX_GEFont* pFont = FX_NEW CFX_GEFont(pFontMgr);
+ CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
if (!pFont->LoadFont(pszFileName)) {
pFont->Release();
return NULL;
@@ -68,7 +68,7 @@ IFX_Font* IFX_Font::LoadFont(IFX_Stream* pFontStream, }
return NULL;
#else
- CFX_GEFont* pFont = FX_NEW CFX_GEFont(pFontMgr);
+ CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
if (!pFont->LoadFont(pFontStream, bSaveStream)) {
pFont->Release();
return NULL;
@@ -79,7 +79,7 @@ IFX_Font* IFX_Font::LoadFont(IFX_Stream* pFontStream, IFX_Font* IFX_Font::LoadFont(CFX_Font* pExtFont,
IFX_FontMgr* pFontMgr,
FX_BOOL bTakeOver) {
- CFX_GEFont* pFont = FX_NEW CFX_GEFont(pFontMgr);
+ CFX_GEFont* pFont = new CFX_GEFont(pFontMgr);
if (!pFont->LoadFont(pExtFont, bTakeOver)) {
pFont->Release();
return NULL;
@@ -125,13 +125,13 @@ CFX_GEFont::CFX_GEFont(const CFX_GEFont& src, FX_DWORD dwFontStyles) m_pProvider(NULL),
m_SubstFonts(),
m_FontMapper(16) {
- m_pFont = FX_NEW CFX_Font;
+ m_pFont = new CFX_Font;
FXSYS_assert(m_pFont != NULL);
FXSYS_assert(src.m_pFont != NULL);
m_pFont->LoadClone(src.m_pFont);
CFX_SubstFont*& pSubst = m_pFont->m_pSubstFont;
if (pSubst == NULL) {
- pSubst = FX_NEW CFX_SubstFont;
+ pSubst = new CFX_SubstFont;
}
if (pSubst) {
pSubst->m_Weight =
@@ -224,7 +224,7 @@ FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, wCharSet = FXSYS_GetACP();
}
m_wCharSet = wCharSet;
- m_pFont = FX_NEW CFX_Font;
+ m_pFont = new CFX_Font;
if ((dwFlags & FXFONT_ITALIC) && (dwFlags & FXFONT_BOLD)) {
csFontFamily += ",BoldItalic";
} else if (dwFlags & FXFONT_BOLD) {
@@ -246,7 +246,7 @@ FX_BOOL CFX_GEFont::LoadFont(const uint8_t* pBuffer, int32_t length) { return FALSE;
}
Lock();
- m_pFont = FX_NEW CFX_Font;
+ m_pFont = new CFX_Font;
FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer, length);
if (bRet) {
InitFont();
@@ -271,7 +271,7 @@ FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFileName) { m_pFileRead = FX_CreateFileRead(m_pStream);
FX_BOOL bRet = FALSE;
if (m_pStream != NULL && m_pFileRead != NULL) {
- m_pFont = FX_NEW CFX_Font;
+ m_pFont = new CFX_Font;
bRet = m_pFont->LoadFile(m_pFileRead);
if (!bRet) {
m_pFileRead->Release();
@@ -299,7 +299,7 @@ FX_BOOL CFX_GEFont::LoadFont(IFX_Stream* pFontStream, FX_BOOL bSaveStream) { m_pStream = pFontStream;
}
m_pFileRead = FX_CreateFileRead(pFontStream);
- m_pFont = FX_NEW CFX_Font;
+ m_pFont = new CFX_Font;
FX_BOOL bRet = m_pFont->LoadFile(m_pFileRead);
if (!bRet) {
m_pFileRead->Release();
@@ -347,14 +347,14 @@ void CFX_GEFont::InitFont() { m_pRectArray = new CFX_RectMassArray(16);
}
if (m_pBBoxMap == NULL) {
- m_pBBoxMap = FX_NEW CFX_MapPtrToPtr(16);
+ m_pBBoxMap = new CFX_MapPtrToPtr(16);
}
}
IFX_Font* CFX_GEFont::Derive(FX_DWORD dwFontStyles, FX_WORD wCodePage) {
if (GetFontStyles() == dwFontStyles) {
return Retain();
}
- return FX_NEW CFX_GEFont(*this, dwFontStyles);
+ return new CFX_GEFont(*this, dwFontStyles);
}
uint8_t CFX_GEFont::GetCharSet() const {
FXSYS_assert(m_pFont != NULL);
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp index bc6b3e7dc8..a3769140cc 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp @@ -11,7 +11,7 @@ IFX_FontMgr* IFX_FontMgr::Create(FX_LPEnumAllFonts pEnumerator,
FX_LPMatchFont pMatcher,
void* pUserData) {
- return FX_NEW CFX_StdFontMgrImp(pEnumerator, pMatcher, pUserData);
+ return new CFX_StdFontMgrImp(pEnumerator, pMatcher, pUserData);
}
CFX_StdFontMgrImp::CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator,
FX_LPMatchFont pMatcher,
@@ -130,7 +130,7 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode( if (ftFace == NULL) {
return NULL;
}
- CFX_Font* pFXFont = FX_NEW CFX_Font;
+ CFX_Font* pFXFont = new CFX_Font;
if (pFXFont == NULL) {
return NULL;
}
@@ -591,7 +591,7 @@ IFX_FileAccess* CFX_FontSourceEnum_File::GetNext(FX_POSITION& pos, return (IFX_FileAccess*)pAccess;
}
IFX_FontSourceEnum* FX_CreateDefaultFontSourceEnum() {
- return (IFX_FontSourceEnum*)FX_NEW CFX_FontSourceEnum_File;
+ return (IFX_FontSourceEnum*)new CFX_FontSourceEnum_File;
}
IFX_FontMgr* IFX_FontMgr::Create(IFX_FontSourceEnum* pFontEnum,
IFX_FontMgrDelegate* pDelegate,
@@ -600,7 +600,7 @@ IFX_FontMgr* IFX_FontMgr::Create(IFX_FontSourceEnum* pFontEnum, return NULL;
}
CFX_FontMgrImp* pFontMgr =
- FX_NEW CFX_FontMgrImp(pFontEnum, pDelegate, pUserData);
+ new CFX_FontMgrImp(pFontEnum, pDelegate, pUserData);
if (NULL == pFontMgr) {
return NULL;
}
@@ -757,7 +757,7 @@ IFX_Font* CFX_FontMgrImp::GetFontByCodePage(FX_WORD wCodePage, }
}
if (NULL == pFonts) {
- pFonts = FX_NEW CFX_ArrayTemplate<IFX_Font*>;
+ pFonts = new CFX_ArrayTemplate<IFX_Font*>;
}
if (NULL == pFonts) {
return NULL;
@@ -765,7 +765,7 @@ IFX_Font* CFX_FontMgrImp::GetFontByCodePage(FX_WORD wCodePage, m_Hash2Fonts.SetAt(dwHash, pFonts);
CFX_FontDescriptorInfos* sortedFonts = NULL;
if (!m_Hash2CandidateList.Lookup(dwHash, sortedFonts)) {
- sortedFonts = FX_NEW CFX_FontDescriptorInfos;
+ sortedFonts = new CFX_FontDescriptorInfos;
MatchFonts(*sortedFonts, wCodePage, dwFontStyles,
CFX_WideString(pszFontFamily), 0);
m_Hash2CandidateList.SetAt(dwHash, sortedFonts);
@@ -819,7 +819,7 @@ IFX_Font* CFX_FontMgrImp::GetFontByUnicode(FX_WCHAR wUnicode, }
}
if (NULL == pFonts) {
- pFonts = FX_NEW CFX_ArrayTemplate<IFX_Font*>;
+ pFonts = new CFX_ArrayTemplate<IFX_Font*>;
}
if (NULL == pFonts) {
return NULL;
@@ -827,7 +827,7 @@ IFX_Font* CFX_FontMgrImp::GetFontByUnicode(FX_WCHAR wUnicode, m_Hash2Fonts.SetAt(dwHash, pFonts);
CFX_FontDescriptorInfos* sortedFonts = NULL;
if (!m_Hash2CandidateList.Lookup(dwHash, sortedFonts)) {
- sortedFonts = FX_NEW CFX_FontDescriptorInfos;
+ sortedFonts = new CFX_FontDescriptorInfos;
MatchFonts(*sortedFonts, wCodePage, dwFontStyles,
CFX_WideString(pszFontFamily), wUnicode);
m_Hash2CandidateList.SetAt(dwHash, sortedFonts);
@@ -973,7 +973,7 @@ IFX_Font* CFX_FontMgrImp::LoadFont(IFX_FileAccess* pFontAccess, }
}
}
- CFX_Font* pInternalFont = FX_NEW CFX_Font;
+ CFX_Font* pInternalFont = new CFX_Font;
if (NULL == pInternalFont) {
return NULL;
}
@@ -1276,7 +1276,7 @@ void CFX_FontMgrImp::ReportFace(FXFT_Face pFace, if (0 == (pFace->face_flags & FT_FACE_FLAG_SCALABLE)) {
return;
}
- CFX_FontDescriptor* pFont = FX_NEW CFX_FontDescriptor;
+ CFX_FontDescriptor* pFont = new CFX_FontDescriptor;
if (NULL == pFont) {
return;
}
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp index 5fa503f54d..a341c2574f 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp @@ -12,7 +12,7 @@ extern const FX_WCHAR gs_FX_TextLayout_VerticalMirror[64]; extern const FX_WCHAR gs_FX_TextLayout_BidiMirror[512];
extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32];
IFX_RTFBreak* IFX_RTFBreak::Create(FX_DWORD dwPolicies) {
- return FX_NEW CFX_RTFBreak(dwPolicies);
+ return new CFX_RTFBreak(dwPolicies);
}
CFX_RTFBreak::CFX_RTFBreak(FX_DWORD dwPolicies)
: m_dwPolicies(dwPolicies),
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp index b5aa82a3b7..05f5510ccd 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp @@ -14,7 +14,7 @@ extern const FX_WCHAR gs_FX_TextLayout_VerticalMirror[64]; extern const FX_WCHAR gs_FX_TextLayout_BidiMirror[512];
extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32];
IFX_TxtBreak* IFX_TxtBreak::Create(FX_DWORD dwPolicies) {
- return FX_NEW CFX_TxtBreak(dwPolicies);
+ return new CFX_TxtBreak(dwPolicies);
}
CFX_TxtBreak::CFX_TxtBreak(FX_DWORD dwPolicies)
: m_dwPolicies(dwPolicies),
@@ -55,11 +55,11 @@ CFX_TxtBreak::CFX_TxtBreak(FX_DWORD dwPolicies) m_bPagination = (m_dwPolicies & FX_TXTBREAKPOLICY_Pagination) != 0;
m_pArabicChar = IFX_ArabicChar::Create();
if (m_bPagination) {
- m_pTxtLine1 = FX_NEW CFX_TxtLine(sizeof(CFX_Char));
- m_pTxtLine2 = FX_NEW CFX_TxtLine(sizeof(CFX_Char));
+ m_pTxtLine1 = new CFX_TxtLine(sizeof(CFX_Char));
+ m_pTxtLine2 = new CFX_TxtLine(sizeof(CFX_Char));
} else {
- m_pTxtLine1 = FX_NEW CFX_TxtLine(sizeof(CFX_TxtChar));
- m_pTxtLine2 = FX_NEW CFX_TxtLine(sizeof(CFX_TxtChar));
+ m_pTxtLine1 = new CFX_TxtLine(sizeof(CFX_TxtChar));
+ m_pTxtLine2 = new CFX_TxtLine(sizeof(CFX_TxtChar));
}
m_pCurLine = m_pTxtLine1;
ResetArabicContext();
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index 1d2a50cd2e..7c8d0d39e2 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -16,7 +16,7 @@ class CFX_TxtLine { public:
CFX_TxtLine(int32_t iBlockSize)
: m_iStart(0), m_iWidth(0), m_iArabicChars(0) {
- m_pLineChars = FX_NEW CFX_TxtCharArray;
+ m_pLineChars = new CFX_TxtCharArray;
m_pLinePieces = new CFX_TxtPieceArray(16);
}
~CFX_TxtLine() {
diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index 15d2d4ce27..fc3ba78bd0 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -72,7 +72,7 @@ static const FX_WCHAR* const gs_LocalNumberSymbols[] = { L"zero", L"currencySymbol", L"currencyName",
};
IFX_Locale* IFX_Locale::Create(CXML_Element* pLocaleData) {
- return FX_NEW CFX_Locale(pLocaleData);
+ return new CFX_Locale(pLocaleData);
}
CFX_Locale::CFX_Locale(CXML_Element* pLocaleData) {
m_pElement = pLocaleData;
@@ -545,7 +545,7 @@ IFX_FormatString* IFX_FormatString::Create(IFX_LocaleMgr* pLocaleMgr, if (!pLocaleMgr) {
return NULL;
}
- return FX_NEW CFX_FormatString(pLocaleMgr, bUseLCID);
+ return new CFX_FormatString(pLocaleMgr, bUseLCID);
}
CFX_FormatString::CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID)
: m_pLocaleMgr(pLocaleMgr), m_bUseLCID(bUseLCID) {}
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index c0a68bf6e9..d236630d6b 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -14,7 +14,7 @@ IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, if (!pPathHandle) {
return NULL;
}
- CFX_LocaleMgr* pLocaleMgr = FX_NEW CFX_LocaleMgr(wDefaultLCID);
+ CFX_LocaleMgr* pLocaleMgr = new CFX_LocaleMgr(wDefaultLCID);
CFX_WideString wsFileName;
FX_BOOL bFolder = FALSE;
while (FX_GetNextFile(pPathHandle, wsFileName, bFolder)) {
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index a5ddce463b..20d65d3f74 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -7,7 +7,7 @@ #include "../fgas_base.h"
#include "fx_sax_imp.h"
IFX_SAXReader* FX_SAXReader_Create() {
- return FX_NEW CFX_SAXReader;
+ return new CFX_SAXReader;
}
CFX_SAXFile::CFX_SAXFile()
: m_pFile(NULL),
@@ -129,7 +129,7 @@ void CFX_SAXReader::Reset() { }
}
inline void CFX_SAXReader::Push() {
- CFX_SAXItem* pNew = FX_NEW CFX_SAXItem;
+ CFX_SAXItem* pNew = new CFX_SAXItem;
pNew->m_dwID = ++m_dwItemID;
pNew->m_bSkip = m_pCurItem->m_bSkip;
pNew->m_pPrev = m_pCurItem;
@@ -192,7 +192,7 @@ int32_t CFX_SAXReader::StartParse(IFX_FileRead* pFile, m_ePrevMode = FX_SAXMODE_Text;
m_bCharData = FALSE;
m_dwDataOffset = 0;
- m_pRoot = m_pCurItem = FX_NEW CFX_SAXItem;
+ m_pRoot = m_pCurItem = new CFX_SAXItem;
m_pCurItem->m_dwID = ++m_dwItemID;
m_dwParseMode = dwParseMode;
return 0;
@@ -371,7 +371,7 @@ void CFX_SAXReader::ParseDeclOrComment() { m_eMode = FX_SAXMODE_Comment;
m_pCurItem->m_eNode = FX_SAXNODE_Comment;
if (m_pCommentContext == NULL) {
- m_pCommentContext = FX_NEW CFX_SAXCommentContext;
+ m_pCommentContext = new CFX_SAXCommentContext;
}
m_pCommentContext->m_iHeaderCount = 1;
m_pCommentContext->m_iTailCount = 0;
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 026acad0ed..ab6c0eb42d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -23,13 +23,13 @@ IFWL_Barcode::~IFWL_Barcode() { }
}
FWL_ERR IFWL_Barcode::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_BarcodeImp(pOuter);
+ m_pData = new CFWL_BarcodeImp(pOuter);
((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
return ((CFWL_BarcodeImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Barcode::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_BarcodeImp(properties, pOuter);
+ m_pData = new CFWL_BarcodeImp(properties, pOuter);
((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
return ((CFWL_BarcodeImp*)m_pData)->Initialize();
}
@@ -62,7 +62,7 @@ FX_DWORD CFWL_BarcodeImp::GetClassID() const { }
FWL_ERR CFWL_BarcodeImp::Initialize() {
if (!m_pDelegate) {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_BarcodeImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_BarcodeImpDelegate(this);
}
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_EditImp::Initialize(),
FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index 1ccab7af7f..c7c52b1c69 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -22,13 +22,13 @@ IFWL_Caret::~IFWL_Caret() { }
}
FWL_ERR IFWL_Caret::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CaretImp(pOuter);
+ m_pData = new CFWL_CaretImp(pOuter);
((CFWL_CaretImp*)m_pData)->SetInterface(this);
return ((CFWL_CaretImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Caret::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CaretImp(properties, pOuter);
+ m_pData = new CFWL_CaretImp(properties, pOuter);
((CFWL_CaretImp*)m_pData)->SetInterface(this);
return ((CFWL_CaretImp*)m_pData)->Initialize();
}
@@ -46,7 +46,7 @@ FWL_ERR IFWL_Caret::SetColor(CFX_Color crFill) { }
CFWL_CaretImp::CFWL_CaretImp(IFWL_Widget* pOuter) : m_hTimer(NULL) {
m_dwElapse = 400;
- m_pTimer = FX_NEW CFWL_CaretTimer(this);
+ m_pTimer = new CFWL_CaretTimer(this);
m_bSetColor = FALSE;
SetStates(FWL_STATE_CAT_HightLight);
}
@@ -54,7 +54,7 @@ CFWL_CaretImp::CFWL_CaretImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter)
: m_hTimer(NULL) {
m_dwElapse = 400;
- m_pTimer = FX_NEW CFWL_CaretTimer(this);
+ m_pTimer = new CFWL_CaretTimer(this);
m_bSetColor = FALSE;
SetStates(FWL_STATE_CAT_HightLight);
}
@@ -74,7 +74,7 @@ FX_DWORD CFWL_CaretImp::GetClassID() const { FWL_ERR CFWL_CaretImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_CaretImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_CaretImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_CaretImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 8fb17ce534..1a77f3b121 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -24,13 +24,13 @@ IFWL_CheckBox::~IFWL_CheckBox() { }
}
FWL_ERR IFWL_CheckBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(pOuter);
+ m_pData = new CFWL_CheckBoxImp(pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_CheckBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(properties, pOuter);
+ m_pData = new CFWL_CheckBoxImp(properties, pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
@@ -53,13 +53,13 @@ IFWL_RadioButton::~IFWL_RadioButton() { }
}
FWL_ERR IFWL_RadioButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(pOuter);
+ m_pData = new CFWL_CheckBoxImp(pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_RadioButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CheckBoxImp(properties, pOuter);
+ m_pData = new CFWL_CheckBoxImp(properties, pOuter);
((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
}
@@ -99,7 +99,7 @@ FX_DWORD CFWL_CheckBoxImp::GetClassID() const { FWL_ERR CFWL_CheckBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_CheckBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_CheckBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_CheckBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 45c3cae8d8..4460a8d0e1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -31,13 +31,13 @@ IFWL_ComboBox::~IFWL_ComboBox() { }
}
FWL_ERR IFWL_ComboBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ComboBoxImp(pOuter);
+ m_pData = new CFWL_ComboBoxImp(pOuter);
((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ComboBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ComboBoxImp(properties, pOuter);
+ m_pData = new CFWL_ComboBoxImp(properties, pOuter);
((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
}
@@ -218,7 +218,7 @@ FWL_ERR CFWL_ComboList::Initialize() { delete (CFWL_ComboListDelegate*)m_pDelegate;
m_pDelegate = NULL;
}
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboListDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboListDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ComboList::Finalize() {
@@ -526,7 +526,7 @@ FWL_ERR CFWL_ComboBoxImp::Initialize() { }
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_WGTSTATE_Invisible);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
CFWL_WidgetImpProperties prop;
prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
prop.m_dwStyles |= FWL_WGTSTYLE_Border | FWL_WGTSTYLE_VScroll;
@@ -534,13 +534,13 @@ FWL_ERR CFWL_ComboBoxImp::Initialize() { prop.m_dwStyleExes |= FWL_STYLEEXT_LTB_Icon;
}
prop.m_pDataProvider = m_pProperties->m_pDataProvider;
- CFWL_ComboList* pList = FX_NEW CFWL_ComboList(prop, m_pInterface);
+ CFWL_ComboList* pList = new CFWL_ComboList(prop, m_pInterface);
m_pListBox = IFWL_ListBox::Create();
pList->SetInterface(m_pListBox);
((IFWL_TargetData*)m_pListBox)->SetData(pList);
pList->Initialize();
if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) && !m_pEdit) {
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
@@ -595,7 +595,7 @@ FWL_ERR CFWL_ComboBoxImp::ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_BOOL bAddDropDown = dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown;
FX_BOOL bRemoveDropDown = dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown;
if (bAddDropDown && !m_pEdit) {
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
@@ -1156,19 +1156,19 @@ void CFWL_ComboBoxImp::InitProxyForm() { propForm.m_pOwner = m_pInterface;
propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
propForm.m_dwStates = FWL_WGTSTATE_Invisible;
- m_pProxy = FX_NEW CFWL_FormProxyImp(propForm, m_pListBox);
+ m_pProxy = new CFWL_FormProxyImp(propForm, m_pListBox);
m_pForm = IFWL_Form::Create();
m_pProxy->SetInterface(m_pForm);
((IFWL_TargetData*)m_pForm)->SetData(m_pProxy);
m_pProxy->Initialize();
m_pListBox->SetParent((IFWL_Widget*)m_pForm);
- m_pListProxyDelegate = FX_NEW CFWL_ComboProxyImpDelegate(m_pForm, this);
+ m_pListProxyDelegate = new CFWL_ComboProxyImpDelegate(m_pForm, this);
m_pProxy->SetDelegate((IFWL_WidgetDelegate*)m_pListProxyDelegate);
}
FWL_ERR CFWL_ComboBoxImp::DisForm_Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_WGTSTATE_Invisible);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ComboBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
DisForm_InitComboList();
DisForm_InitComboEdit();
return FWL_ERR_Succeeded;
@@ -1183,7 +1183,7 @@ void CFWL_ComboBoxImp::DisForm_InitComboList() { prop.m_dwStates = FWL_WGTSTATE_Invisible;
prop.m_pDataProvider = m_pProperties->m_pDataProvider;
prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
- CFWL_ComboList* pList = FX_NEW CFWL_ComboList(prop, m_pInterface);
+ CFWL_ComboList* pList = new CFWL_ComboList(prop, m_pInterface);
m_pListBox = IFWL_ListBox::Create();
pList->SetInterface(m_pListBox);
((IFWL_TargetData*)m_pListBox)->SetData(pList);
@@ -1198,7 +1198,7 @@ void CFWL_ComboBoxImp::DisForm_InitComboEdit() { prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) == 0) {
}
- CFWL_ComboEdit* pEdit = FX_NEW CFWL_ComboEdit(prop, m_pInterface);
+ CFWL_ComboEdit* pEdit = new CFWL_ComboEdit(prop, m_pInterface);
m_pEdit = IFWL_Edit::Create();
pEdit->SetInterface(m_pEdit);
((IFWL_TargetData*)m_pEdit)->SetData(pEdit);
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 7bf4f0d8aa..b7bc8fc349 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -23,21 +23,21 @@ IFWL_DateTimePicker* IFWL_DateTimePicker::Create() { FWL_ERR IFWL_DateTimeForm::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormProxyImp(properties, pOuter);
+ m_pData = new CFWL_FormProxyImp(properties, pOuter);
((CFWL_FormProxyImp*)m_pData)->SetInterface(this);
return ((CFWL_FormProxyImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimeCalender::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimeCalendar(properties, pOuter);
+ m_pData = new CFWL_DateTimeCalendar(properties, pOuter);
((CFWL_DateTimeCalendar*)m_pData)->SetInterface(this);
return ((CFWL_DateTimeCalendar*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimeEdit::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimeEdit(properties, pOuter);
+ m_pData = new CFWL_DateTimeEdit(properties, pOuter);
((CFWL_DateTimeEdit*)m_pData)->SetInterface(this);
return ((CFWL_DateTimeEdit*)m_pData)->Initialize();
}
@@ -51,14 +51,14 @@ IFWL_DateTimePicker::~IFWL_DateTimePicker() { }
}
FWL_ERR IFWL_DateTimePicker::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimePickerImp(pOuter);
+ m_pData = new CFWL_DateTimePickerImp(pOuter);
((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_DateTimePicker::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_DateTimePickerImp(properties, pOuter);
+ m_pData = new CFWL_DateTimePickerImp(properties, pOuter);
((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
}
@@ -145,7 +145,7 @@ CFWL_DateTimeEdit::CFWL_DateTimeEdit(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter)
: CFWL_EditImp(properties, pOuter) {}
FWL_ERR CFWL_DateTimeEdit::Initialize() {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimeEditDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_DateTimeEditDelegate(this);
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_EditImp::Initialize(),
FWL_ERR_Indefinite);
return FWL_ERR_Succeeded;
@@ -211,7 +211,7 @@ FWL_ERR CFWL_DateTimeCalendar::Initialize() { delete (CFWL_MonthCalendarImpDelegate*)m_pDelegate;
}
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimeCalendarDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_DateTimeCalendarDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_DateTimeCalendar::Finalize() {
@@ -455,7 +455,7 @@ FWL_ERR CFWL_DateTimePickerImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_DateTimePickerImpDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_DateTimePickerImpDelegate(this);
m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
CFWL_WidgetImpProperties propMonth;
propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index e73cc5f7e0..93061f35cb 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -27,13 +27,13 @@ IFWL_Edit::~IFWL_Edit() { }
}
FWL_ERR IFWL_Edit::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_EditImp(pOuter);
+ m_pData = new CFWL_EditImp(pOuter);
((CFWL_EditImp*)m_pData)->SetInterface(this);
return ((CFWL_EditImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Edit::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_EditImp(properties, pOuter);
+ m_pData = new CFWL_EditImp(properties, pOuter);
((CFWL_EditImp*)m_pData)->SetInterface(this);
return ((CFWL_EditImp*)m_pData)->Initialize();
}
@@ -245,7 +245,7 @@ FWL_ERR CFWL_EditImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
if (!m_pDelegate) {
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_EditImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_EditImpDelegate(this);
}
InitCaret();
if (!m_pEdtEngine) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index 5dcbb8af6f..57c9490d71 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -33,7 +33,7 @@ FX_BOOL CFWL_FormProxyImp::IsInstance(const CFX_WideStringC& wsClass) const { FWL_ERR CFWL_FormProxyImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_FormProxyImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_FormProxyImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_FormProxyImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index e20afa32c5..1151f2f8ee 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -24,13 +24,13 @@ IFWL_ListBox::~IFWL_ListBox() { }
}
FWL_ERR IFWL_ListBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ListBoxImp(pOuter);
+ m_pData = new CFWL_ListBoxImp(pOuter);
((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ListBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ListBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ListBoxImp(properties, pOuter);
+ m_pData = new CFWL_ListBoxImp(properties, pOuter);
((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_ListBoxImp*)m_pData)->Initialize();
}
@@ -104,7 +104,7 @@ FX_DWORD CFWL_ListBoxImp::GetClassID() const { FWL_ERR CFWL_ListBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ListBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ListBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ListBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 822160f6b0..494bc3151c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -30,14 +30,14 @@ IFWL_MonthCalendar::~IFWL_MonthCalendar() { }
}
FWL_ERR IFWL_MonthCalendar::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_MonthCalendarImp(pOuter);
+ m_pData = new CFWL_MonthCalendarImp(pOuter);
((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_MonthCalendar::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_MonthCalendarImp(properties, pOuter);
+ m_pData = new CFWL_MonthCalendarImp(properties, pOuter);
((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
}
@@ -132,7 +132,7 @@ FWL_ERR CFWL_MonthCalendarImp::Initialize() { _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
m_pDelegate =
- (IFWL_WidgetDelegate*)FX_NEW CFWL_MonthCalendarImpDelegate(this);
+ (IFWL_WidgetDelegate*)new CFWL_MonthCalendarImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_MonthCalendarImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 4818945f8a..219aa88598 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -22,13 +22,13 @@ IFWL_PictureBox::~IFWL_PictureBox() { }
}
FWL_ERR IFWL_PictureBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PictureBoxImp(pOuter);
+ m_pData = new CFWL_PictureBoxImp(pOuter);
((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_PictureBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PictureBoxImp(properties, pOuter);
+ m_pData = new CFWL_PictureBoxImp(properties, pOuter);
((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
}
@@ -63,7 +63,7 @@ FX_DWORD CFWL_PictureBoxImp::GetClassID() const { FWL_ERR CFWL_PictureBoxImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_PictureBoxImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_PictureBoxImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_PictureBoxImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 3329a76ee7..7fe9a7fb3f 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -13,13 +13,13 @@ IFWL_PushButton* IFWL_PushButton::Create() { return new IFWL_PushButton;
}
FWL_ERR IFWL_PushButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PushButtonImp(pOuter);
+ m_pData = new CFWL_PushButtonImp(pOuter);
((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_PushButtonImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_PushButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PushButtonImp(properties, pOuter);
+ m_pData = new CFWL_PushButtonImp(properties, pOuter);
((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_PushButtonImp*)m_pData)->Initialize();
}
@@ -61,7 +61,7 @@ FX_DWORD CFWL_PushButtonImp::GetClassID() const { FWL_ERR CFWL_PushButtonImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_PushButtonImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_PushButtonImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_PushButtonImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index a692d50448..6d0887b263 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -24,13 +24,13 @@ IFWL_ScrollBar::~IFWL_ScrollBar() { }
}
FWL_ERR IFWL_ScrollBar::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ScrollBarImp(pOuter);
+ m_pData = new CFWL_ScrollBarImp(pOuter);
((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ScrollBar::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ScrollBarImp(properties, pOuter);
+ m_pData = new CFWL_ScrollBarImp(properties, pOuter);
((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
}
@@ -148,7 +148,7 @@ FX_DWORD CFWL_ScrollBarImp::GetClassID() const { FWL_ERR CFWL_ScrollBarImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ScrollBarImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ScrollBarImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ScrollBarImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 28d3be46ca..8736b17906 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -25,13 +25,13 @@ IFWL_SpinButton::~IFWL_SpinButton() { }
}
FWL_ERR IFWL_SpinButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_SpinButtonImp;
+ m_pData = new CFWL_SpinButtonImp;
((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_SpinButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_SpinButtonImp(properties);
+ m_pData = new CFWL_SpinButtonImp(properties);
((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
}
@@ -78,7 +78,7 @@ FX_DWORD CFWL_SpinButtonImp::GetClassID() const { FWL_ERR CFWL_SpinButtonImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_SpinButtonImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_SpinButtonImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_SpinButtonImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index a0a9a85634..6de913615d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -15,13 +15,13 @@ IFWL_ToolTip* IFWL_ToolTip::Create() { return new IFWL_ToolTip;
}
FWL_ERR IFWL_ToolTip::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ToolTipImp(pOuter);
+ m_pData = new CFWL_ToolTipImp(pOuter);
((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
return ((CFWL_ToolTipImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_ToolTip::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_ToolTipImp(properties, pOuter);
+ m_pData = new CFWL_ToolTipImp(properties, pOuter);
((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
return ((CFWL_ToolTipImp*)m_pData)->Initialize();
}
@@ -90,7 +90,7 @@ FWL_ERR CFWL_ToolTipImp::Initialize() { m_pProperties->m_dwStyles &= ~FWL_WGTSTYLE_Child;
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_ToolTipImpDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ToolTipImpDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ToolTipImp::Finalize() {
diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index f20fe0f6db..45efbe9823 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -9,27 +9,27 @@ static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
switch (type) {
case BC_CODE39:
- return FX_NEW CBC_Code39();
+ return new CBC_Code39();
case BC_CODABAR:
- return FX_NEW CBC_Codabar();
+ return new CBC_Codabar();
case BC_CODE128:
- return FX_NEW CBC_Code128(BC_CODE128_B);
+ return new CBC_Code128(BC_CODE128_B);
case BC_CODE128_B:
- return FX_NEW CBC_Code128(BC_CODE128_B);
+ return new CBC_Code128(BC_CODE128_B);
case BC_CODE128_C:
- return FX_NEW CBC_Code128(BC_CODE128_C);
+ return new CBC_Code128(BC_CODE128_C);
case BC_EAN8:
- return FX_NEW CBC_EAN8();
+ return new CBC_EAN8();
case BC_UPCA:
- return FX_NEW CBC_UPCA();
+ return new CBC_UPCA();
case BC_EAN13:
- return FX_NEW CBC_EAN13();
+ return new CBC_EAN13();
case BC_QR_CODE:
- return FX_NEW CBC_QRCode();
+ return new CBC_QRCode();
case BC_PDF417:
- return FX_NEW CBC_PDF417I();
+ return new CBC_PDF417I();
case BC_DATAMATRIX:
- return FX_NEW CBC_DataMatrix();
+ return new CBC_DataMatrix();
case BC_UNKNOWN:
default:
return NULL;
@@ -368,7 +368,7 @@ CFX_WideString CFX_Barcode::Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode) { return CFX_WideString();
}
IFX_Barcode* FX_Barcode_Create(BC_TYPE type) {
- CFX_Barcode* pBarcode = FX_NEW CFX_Barcode;
+ CFX_Barcode* pBarcode = new CFX_Barcode;
if (pBarcode->Crreate(type)) {
return pBarcode;
}
diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index f59032a6a4..d9d37e2f9e 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -11,7 +11,7 @@ #include "include/fwl_widgetmgrimp.h"
#include "include/fwl_appimp.h"
IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
- return (IFWL_App*)FX_NEW CFWL_AppImp(pAdapter);
+ return (IFWL_App*)new CFWL_AppImp(pAdapter);
}
CFWL_AppImp::CFWL_AppImp(IFWL_AdapterNative* pAdapter)
: m_pWidgetMgr(NULL), m_pThemeProvider(NULL) {
@@ -36,7 +36,7 @@ CFWL_AppImp::~CFWL_AppImp() { }
FWL_ERR CFWL_AppImp::Initialize() {
if (!m_pWidgetMgr) {
- m_pWidgetMgr = FX_NEW CFWL_WidgetMgr(m_pAdapterNative);
+ m_pWidgetMgr = new CFWL_WidgetMgr(m_pAdapterNative);
}
return FWL_ERR_Succeeded;
}
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 9a9f8ba2cd..b99b84dbbd 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -15,7 +15,7 @@ IFWL_Content* IFWL_Content::Create() { return new IFWL_Content;
}
FWL_ERR IFWL_Content::Initialize() {
- m_pData = FX_NEW CFWL_ContentImp;
+ m_pData = new CFWL_ContentImp;
((CFWL_ContentImp*)m_pData)->SetInterface(this);
return ((CFWL_ContentImp*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index b18cdb12b5..85139ca1a1 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -21,20 +21,20 @@ IFWL_Form* IFWL_Form::Create() { return new IFWL_Form;
}
FWL_ERR IFWL_Form::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(pOuter);
+ m_pData = new CFWL_FormImp(pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
return ((CFWL_FormImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(properties, pOuter);
+ m_pData = new CFWL_FormImp(properties, pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
return ((CFWL_FormImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
CFX_WideString* classname,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_FormImp(properties, pOuter);
+ m_pData = new CFWL_FormImp(properties, pOuter);
((CFWL_FormImp*)m_pData)->SetInterface(this);
((CFWL_FormImp*)m_pData)->SetPrivateData(this, classname, NULL);
return ((CFWL_FormImp*)m_pData)->Initialize();
@@ -152,7 +152,7 @@ FWL_ERR CFWL_FormImp::Initialize() { FWL_ERR_Indefinite);
RegisterForm();
RegisterEventTarget();
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_FormDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_FormDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_FormImp::Finalize() {
@@ -436,7 +436,7 @@ IFWL_Widget* CFWL_FormImp::DoModal() { _FWL_RETURN_VALUE_IF_FAIL(pThread, NULL);
IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
_FWL_RETURN_VALUE_IF_FAIL(pDriver, NULL);
- m_pNoteLoop = FX_NEW CFWL_NoteLoop(this);
+ m_pNoteLoop = new CFWL_NoteLoop(this);
pDriver->PushNoteLoop((IFWL_NoteLoop*)m_pNoteLoop);
m_bDoModalFlag = TRUE;
SetStates(FWL_WGTSTATE_Invisible, FALSE);
@@ -781,7 +781,7 @@ void CFWL_FormImp::ReSetSysBtn() { }
m_iSysBox = 0;
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_CloseBox) {
- m_pCloseBox = FX_NEW CFWL_SysBtn;
+ m_pCloseBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
@@ -795,7 +795,7 @@ void CFWL_FormImp::ReSetSysBtn() { m_iSysBox++;
}
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MaximizeBox) {
- m_pMaxBox = FX_NEW CFWL_SysBtn;
+ m_pMaxBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
@@ -815,7 +815,7 @@ void CFWL_FormImp::ReSetSysBtn() { m_iSysBox++;
}
if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_MinimizeBox) {
- m_pMinBox = FX_NEW CFWL_SysBtn;
+ m_pMinBox = new CFWL_SysBtn;
if (m_bCustomizeLayout) {
CFWL_ThemeBackground param;
param.m_pWidget = m_pInterface;
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index d6e011ab16..d7db6a6f11 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -15,12 +15,12 @@ IFWL_Grid* IFWL_Grid::Create() { return new IFWL_Grid;
}
FWL_ERR IFWL_Grid::Initialize() {
- m_pData = FX_NEW CFWL_GridImp;
+ m_pData = new CFWL_GridImp;
((CFWL_GridImp*)m_pData)->SetInterface(this);
return ((CFWL_GridImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Grid::Initialize(CFWL_WidgetImpProperties& properties) {
- m_pData = FX_NEW CFWL_GridImp(properties);
+ m_pData = new CFWL_GridImp(properties);
((CFWL_GridImp*)m_pData)->SetInterface(this);
return ((CFWL_GridImp*)m_pData)->Initialize();
}
@@ -187,7 +187,7 @@ FX_DWORD CFWL_GridImp::GetClassID() const { FWL_ERR CFWL_GridImp::Initialize() {
_FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_ContentImp::Initialize(),
FWL_ERR_Indefinite);
- m_pDelegate = (IFWL_WidgetDelegate*)FX_NEW CFWL_GridDelegate(this);
+ m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_GridDelegate(this);
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_GridImp::Finalize() {
@@ -274,7 +274,7 @@ FWL_ERR CFWL_GridImp::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { _FWL_RETURN_VALUE_IF_FAIL(pChild, FWL_ERR_Indefinite);
CFWL_ContentImp::InsertWidget(pChild, nIndex);
if (!m_mapWidgetInfo.GetValueAt(pChild)) {
- CFWL_GridWidgetInfo* pInfo = FX_NEW CFWL_GridWidgetInfo;
+ CFWL_GridWidgetInfo* pInfo = new CFWL_GridWidgetInfo;
m_mapWidgetInfo.SetAt(pChild, pInfo);
m_Widgets.Add(pChild);
}
@@ -297,14 +297,14 @@ FWL_HGRIDCOLROW CFWL_GridImp::InsertColRow(FX_BOOL bColumn, int32_t nIndex) { if (nIndex < 0 || nIndex > m_Columns.GetSize()) {
nIndex = m_Columns.GetSize();
}
- CFWL_GridColRow* pColumn = FX_NEW CFWL_GridColRow;
+ CFWL_GridColRow* pColumn = new CFWL_GridColRow;
m_Columns.InsertAt(nIndex, pColumn, 1);
return (FWL_HGRIDCOLROW)pColumn;
}
if (nIndex < 0 || nIndex > m_Rows.GetSize()) {
nIndex = m_Rows.GetSize();
}
- CFWL_GridColRow* pRow = FX_NEW CFWL_GridColRow;
+ CFWL_GridColRow* pRow = new CFWL_GridColRow;
m_Rows.InsertAt(nIndex, pRow, 1);
return (FWL_HGRIDCOLROW)pRow;
}
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 90abc1e275..2c3a79429e 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -97,7 +97,7 @@ CFWL_NoteDriver::CFWL_NoteDriver() m_pHover(NULL),
m_pGrab(NULL),
m_hook(NULL) {
- m_pNoteLoop = FX_NEW CFWL_NoteLoop;
+ m_pNoteLoop = new CFWL_NoteLoop;
PushNoteLoop((IFWL_NoteLoop*)m_pNoteLoop);
}
CFWL_NoteDriver::~CFWL_NoteDriver() {
@@ -169,7 +169,7 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget* pListener, }
CFWL_EventTarget* value = NULL;
if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {
- value = FX_NEW CFWL_EventTarget(this, pListener);
+ value = new CFWL_EventTarget(this, pListener);
m_eventTargets.SetAt((void*)(uintptr_t)dwkey, value);
}
value->SetEventSource(pEventSource, dwFilter);
@@ -912,7 +912,7 @@ CFWL_ToolTipContainer* CFWL_ToolTipContainer::s_pInstance = NULL; CFWL_ToolTipContainer::CFWL_ToolTipContainer()
: pCurTarget(NULL), m_pToolTipImp(NULL) {
- m_ToolTipDp = FX_NEW CFWL_CoreToopTipDP;
+ m_ToolTipDp = new CFWL_CoreToopTipDP;
m_ToolTipDp->m_nInitDelayTime = 0;
m_ToolTipDp->m_nAutoPopDelayTime = 2000;
}
@@ -931,7 +931,7 @@ CFWL_ToolTipContainer::~CFWL_ToolTipContainer() { // static
CFWL_ToolTipContainer* CFWL_ToolTipContainer::getInstance() {
if (!s_pInstance) {
- s_pInstance = FX_NEW CFWL_ToolTipContainer;
+ s_pInstance = new CFWL_ToolTipContainer;
}
return s_pInstance;
}
@@ -978,7 +978,7 @@ FX_BOOL CFWL_ToolTipContainer::ProcessEnter(CFWL_EvtMouse* pEvt, CFX_RectF rtTooltip;
rtTooltip.Set(150, 150, 100, 50);
prop.m_rtWidget = rtTooltip;
- m_pToolTipImp = FX_NEW CFWL_ToolTipImp(prop);
+ m_pToolTipImp = new CFWL_ToolTipImp(prop);
IFWL_ToolTip* pToolTip = IFWL_ToolTip::Create();
m_pToolTipImp->SetInterface(pToolTip);
((IFWL_TargetData*)pToolTip)->SetData(m_pToolTipImp);
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index 54da08d600..bca581b03d 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -13,13 +13,13 @@ IFWL_Panel* IFWL_Panel::Create() { return new IFWL_Panel;
}
FWL_ERR IFWL_Panel::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PanelImp(pOuter);
+ m_pData = new CFWL_PanelImp(pOuter);
((CFWL_PanelImp*)m_pData)->SetInterface(this);
return ((CFWL_PanelImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_Panel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_PanelImp(properties, pOuter);
+ m_pData = new CFWL_PanelImp(properties, pOuter);
((CFWL_PanelImp*)m_pData)->SetInterface(this);
return ((CFWL_PanelImp*)m_pData)->Initialize();
}
@@ -142,13 +142,13 @@ IFWL_CustomPanel* IFWL_CustomPanel::Create() { return new IFWL_CustomPanel;
}
FWL_ERR IFWL_CustomPanel::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CustomPanelImp(pOuter);
+ m_pData = new CFWL_CustomPanelImp(pOuter);
((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
}
FWL_ERR IFWL_CustomPanel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_CustomPanelImp(properties, pOuter);
+ m_pData = new CFWL_CustomPanelImp(properties, pOuter);
((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index ca713346b8..98672f3abe 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -17,7 +17,7 @@ FWL_ERR CFWL_ControlThread::Run(FWL_HTHREAD hThread) { return FWL_ERR_Succeeded;
}
IFWL_Thread* IFWL_Thread::Create() {
- return (IFWL_Thread*)FX_NEW CFWL_Thread;
+ return (IFWL_Thread*)new CFWL_Thread;
}
CFWL_Thread::CFWL_Thread() {}
CFWL_Thread::~CFWL_Thread() {}
@@ -28,10 +28,10 @@ CFWL_ControlThread* CFWL_NoteThread::_assistantThreadHandler = NULL; FWL_HTHREAD CFWL_NoteThread::_assistantThread = NULL;
int32_t CFWL_NoteThread::_refCount = 0;
IFWL_NoteThread* IFWL_NoteThread::Create() {
- return (IFWL_NoteThread*)FX_NEW CFWL_NoteThread;
+ return (IFWL_NoteThread*)new CFWL_NoteThread;
}
CFWL_NoteThread::CFWL_NoteThread() : m_hThread(NULL) {
- m_pNoteDriver = FX_NEW CFWL_NoteDriver;
+ m_pNoteDriver = new CFWL_NoteDriver;
}
CFWL_NoteThread::~CFWL_NoteThread() {
if (m_hThread) {
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index e901dae199..d5246d31e7 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -501,7 +501,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(IFWL_Widget* pOuter) m_pOuter(pOuter),
m_pInterface(NULL),
m_iLock(0) {
- m_pProperties = FX_NEW CFWL_WidgetImpProperties;
+ m_pProperties = new CFWL_WidgetImpProperties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
FXSYS_assert(m_pWidgetMgr != NULL);
}
@@ -515,7 +515,7 @@ CFWL_WidgetImp::CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties, m_pInterface(NULL),
m_iLock(0) {
if (!m_pProperties) {
- m_pProperties = FX_NEW CFWL_WidgetImpProperties;
+ m_pProperties = new CFWL_WidgetImpProperties;
}
*m_pProperties = properties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
@@ -1124,13 +1124,13 @@ IFWL_Custom::~IFWL_Custom() { }
}
FWL_ERR IFWL_Custom::Initialize(IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_Custom(pOuter);
+ m_pData = new CFWL_Custom(pOuter);
((CFWL_Custom*)m_pData)->SetInterface(this);
return ((CFWL_Custom*)m_pData)->Initialize();
}
FWL_ERR IFWL_Custom::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = FX_NEW CFWL_Custom(properties, pOuter);
+ m_pData = new CFWL_Custom(properties, pOuter);
((CFWL_Custom*)m_pData)->SetInterface(this);
return ((CFWL_Custom*)m_pData)->Initialize();
}
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 2719ff96ec..5671ff699a 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -25,11 +25,11 @@ IFWL_WidgetMgr* FWL_GetWidgetMgr() { }
CFWL_WidgetMgr::CFWL_WidgetMgr(IFWL_AdapterNative* pAdapterNative)
: m_dwCapability(0) {
- m_pDelegate = FX_NEW CFWL_WidgetMgrDelegate(this);
+ m_pDelegate = new CFWL_WidgetMgrDelegate(this);
m_pAdapter =
pAdapterNative->GetWidgetMgr((IFWL_WidgetMgrDelegate*)m_pDelegate);
FXSYS_assert(m_pAdapter);
- CFWL_WidgetMgrItem* pRoot = FX_NEW CFWL_WidgetMgrItem;
+ CFWL_WidgetMgrItem* pRoot = new CFWL_WidgetMgrItem;
m_mapWidgetItem.SetAt(NULL, pRoot);
#if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
m_rtScreen.Reset();
@@ -236,7 +236,7 @@ void CFWL_WidgetMgr::AddWidget(IFWL_Widget* pWidget) { CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(NULL);
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pWidget;
m_mapWidgetItem.SetAt(pWidget, pItem);
}
@@ -259,7 +259,7 @@ void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent, int32_t nIndex) {
CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pParent);
if (!pParentItem) {
- pParentItem = FX_NEW CFWL_WidgetMgrItem;
+ pParentItem = new CFWL_WidgetMgrItem;
pParentItem->pWidget = pParent;
m_mapWidgetItem.SetAt(pParent, pParentItem);
CFWL_WidgetMgrItem* pRoot = GetWidgetMgrItem(NULL);
@@ -268,7 +268,7 @@ void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent, }
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pChild);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pChild;
m_mapWidgetItem.SetAt(pChild, pItem);
}
@@ -312,7 +312,7 @@ void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* pWidget) { void CFWL_WidgetMgr::SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned) {
CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pOwner);
if (!pParentItem) {
- pParentItem = FX_NEW CFWL_WidgetMgrItem;
+ pParentItem = new CFWL_WidgetMgrItem;
pParentItem->pWidget = pOwner;
m_mapWidgetItem.SetAt(pOwner, pParentItem);
CFWL_WidgetMgrItem* pRoot = GetWidgetMgrItem(NULL);
@@ -321,7 +321,7 @@ void CFWL_WidgetMgr::SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned) { }
CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pOwned);
if (!pItem) {
- pItem = FX_NEW CFWL_WidgetMgrItem;
+ pItem = new CFWL_WidgetMgrItem;
pItem->pWidget = pOwned;
m_mapWidgetItem.SetAt(pOwned, pItem);
}
@@ -824,7 +824,7 @@ CFX_Graphics* CFWL_WidgetMgrDelegate::DrawWidgetBefore( }
CFWL_WidgetMgrItem* pItem = m_pWidgetMgr->GetWidgetMgrItem(pWidget);
if (!pItem->pOffscreen) {
- pItem->pOffscreen = FX_NEW CFX_Graphics;
+ pItem->pOffscreen = new CFX_Graphics;
CFX_RectF rect;
pWidget->GetWidgetRect(rect);
pItem->pOffscreen->Create((int32_t)rect.width, (int32_t)rect.height,
diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 9441b8f2f4..58d41ca6c3 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -17,7 +17,7 @@ CFWL_App::~CFWL_App() { m_pAppImp->Release();
}
FWL_ERR CFWL_App::Initialize() {
- m_pThemeProvider = FX_NEW CFWL_Theme;
+ m_pThemeProvider = new CFWL_Theme;
m_pThemeProvider->Initialize();
m_pAppImp->SetThemeProvider((IFWL_ThemeProvider*)m_pThemeProvider);
return m_pAppImp->Initialize();
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index f71a00d2ca..3c881b6254 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Barcode* CFWL_Barcode::Create() {
- return FX_NEW CFWL_Barcode;
+ return new CFWL_Barcode;
}
FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index a09ce40ffb..b182be0879 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Caret* CFWL_Caret::Create() {
- return FX_NEW CFWL_Caret;
+ return new CFWL_Caret;
}
FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index 79d4886fdf..fe2a7595da 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_CheckBox* CFWL_CheckBox::Create() {
- return FX_NEW CFWL_CheckBox;
+ return new CFWL_CheckBox;
}
FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index aec2403ae3..e8ae65cf6c 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ComboBox* CFWL_ComboBox::Create() {
- return FX_NEW CFWL_ComboBox;
+ return new CFWL_ComboBox;
}
FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
@@ -34,14 +34,14 @@ FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { return ret;
}
int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) {
- CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;
+ CFWL_ComboBoxItem* pItem = new CFWL_ComboBoxItem;
pItem->m_wsText = wsText;
pItem->m_dwStyles = 0;
return m_comboBoxData.m_arrItem.Add(pItem);
}
int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText,
CFX_DIBitmap* pIcon) {
- CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;
+ CFWL_ComboBoxItem* pItem = new CFWL_ComboBoxItem;
pItem->m_wsText = wsText;
pItem->m_dwStyles = 0;
pItem->m_pDIB = pIcon;
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 008a22179d..0770659f9b 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_DateTimePicker* CFWL_DateTimePicker::Create() {
- return FX_NEW CFWL_DateTimePicker;
+ return new CFWL_DateTimePicker;
}
FWL_ERR CFWL_DateTimePicker::Initialize(
const CFWL_WidgetProperties* pProperties) {
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 8447d1494e..0edc533752 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_Edit* CFWL_Edit::Create() {
- return FX_NEW CFWL_Edit;
+ return new CFWL_Edit;
}
FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 2bfd10c173..b45e0feed1 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ListBox* CFWL_ListBox::Create() {
- return FX_NEW CFWL_ListBox;
+ return new CFWL_ListBox;
}
FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
@@ -39,7 +39,7 @@ FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, FWL_HLISTITEM hItem) { }
FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
FX_BOOL bSelect) {
- CFWL_ListItem* pItem = FX_NEW CFWL_ListItem;
+ CFWL_ListItem* pItem = new CFWL_ListItem;
pItem->m_dwStates = 0;
pItem->m_wsText = wsAdd;
pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index dd7fe16eef..80f46e5ccf 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_PictureBox* CFWL_PictureBox::Create() {
- return FX_NEW CFWL_PictureBox;
+ return new CFWL_PictureBox;
}
FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index e0df77f502..7ca1a13c0d 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_PushButton* CFWL_PushButton::Create() {
- return FX_NEW CFWL_PushButton;
+ return new CFWL_PushButton;
}
FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 6b4e326d2a..3594769c5f 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_ScrollBar* CFWL_ScrollBar::Create() {
- return FX_NEW CFWL_ScrollBar;
+ return new CFWL_ScrollBar;
}
FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index e8fb41de69..99157f3b74 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -89,18 +89,18 @@ FWL_ERR CFWL_Theme::Finalize() { return FWL_ERR_Succeeded;
}
CFWL_Theme::CFWL_Theme() {
- CFWL_FormTP* pFormTP = FX_NEW CFWL_FormTP;
- CFWL_PushButtonTP* pPushButtonTP = FX_NEW CFWL_PushButtonTP;
- CFWL_CheckBoxTP* pCheckBoxTP = FX_NEW CFWL_CheckBoxTP;
- CFWL_ListBoxTP* pListBoxTP = FX_NEW CFWL_ListBoxTP;
- CFWL_PictureBoxTP* pPictureBoxTP = FX_NEW CFWL_PictureBoxTP;
- CFWL_ScrollBarTP* pSrollBarTP = FX_NEW CFWL_ScrollBarTP;
- CFWL_EditTP* pEditTP = FX_NEW CFWL_EditTP;
- CFWL_ComboBoxTP* pComboBoxTP = FX_NEW CFWL_ComboBoxTP;
- CFWL_BarcodeTP* pBarcodeTP = FX_NEW CFWL_BarcodeTP;
- CFWL_DateTimePickerTP* pDateTimePickerTP = FX_NEW CFWL_DateTimePickerTP;
- CFWL_MonthCalendarTP* pMonthCalendarTP = FX_NEW CFWL_MonthCalendarTP;
- CFWL_CaretTP* pCaretTP = FX_NEW CFWL_CaretTP;
+ CFWL_FormTP* pFormTP = new CFWL_FormTP;
+ CFWL_PushButtonTP* pPushButtonTP = new CFWL_PushButtonTP;
+ CFWL_CheckBoxTP* pCheckBoxTP = new CFWL_CheckBoxTP;
+ CFWL_ListBoxTP* pListBoxTP = new CFWL_ListBoxTP;
+ CFWL_PictureBoxTP* pPictureBoxTP = new CFWL_PictureBoxTP;
+ CFWL_ScrollBarTP* pSrollBarTP = new CFWL_ScrollBarTP;
+ CFWL_EditTP* pEditTP = new CFWL_EditTP;
+ CFWL_ComboBoxTP* pComboBoxTP = new CFWL_ComboBoxTP;
+ CFWL_BarcodeTP* pBarcodeTP = new CFWL_BarcodeTP;
+ CFWL_DateTimePickerTP* pDateTimePickerTP = new CFWL_DateTimePickerTP;
+ CFWL_MonthCalendarTP* pMonthCalendarTP = new CFWL_MonthCalendarTP;
+ CFWL_CaretTP* pCaretTP = new CFWL_CaretTP;
m_arrThemes.Add(pFormTP);
m_arrThemes.Add(pPushButtonTP);
m_arrThemes.Add(pCheckBoxTP);
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 1864c288fc..42ceeaceee 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -12,7 +12,7 @@ #include "../core/include/fwl_formimp.h"
#include "../core/include/fwl_threadimp.h"
CFWL_ToolTip* CFWL_ToolTip::Create() {
- return FX_NEW CFWL_ToolTip;
+ return new CFWL_ToolTip;
}
FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) {
_FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 85bb710bd6..283aed0e2f 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -191,7 +191,7 @@ IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) { }
CFWL_Widget::CFWL_Widget()
: m_pImp(NULL), m_pDelegate(NULL), m_pProperties(NULL) {
- m_pProperties = FX_NEW CFWL_WidgetProperties;
+ m_pProperties = new CFWL_WidgetProperties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
FXSYS_assert(m_pWidgetMgr != NULL);
}
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index d86f1886a6..e488918ee3 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -14,7 +14,7 @@ #define CHECKBOX_COLOR_BOXRB2 (ArgbEncode(255, 255, 255, 255))
#define CHECKBOX_FXGE_CoordinatesAdjust
CFWL_CheckBoxTP::CFWL_CheckBoxTP() : m_pCheckPath(NULL) {
- m_pThemeData = FX_NEW CKBThemeData;
+ m_pThemeData = new CKBThemeData;
SetThemeData(0);
}
CFWL_CheckBoxTP::~CFWL_CheckBoxTP() {
@@ -456,7 +456,7 @@ void CFWL_CheckBoxTP::SetThemeData(FX_DWORD dwID) { }
void CFWL_CheckBoxTP::initCheckPath(FX_FLOAT fCheckLen) {
if (!m_pCheckPath) {
- m_pCheckPath = FX_NEW CFX_Path;
+ m_pCheckPath = new CFX_Path;
m_pCheckPath->Create();
FX_FLOAT fWidth = CHECKBOX_SIZE_SIGNPATH;
FX_FLOAT fHeight = -CHECKBOX_SIZE_SIGNPATH;
diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp index 70d31255b6..aac8cae71f 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -6,7 +6,7 @@ #include "../../../foxitlib.h"
CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() {
- m_pThemeData = FX_NEW DTPThemeData;
+ m_pThemeData = new DTPThemeData;
initThemeData();
}
CFWL_DateTimePickerTP::~CFWL_DateTimePickerTP() {
diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index 6bb372d127..217de374ce 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -16,7 +16,7 @@ #define FWLTHEME_FORMBTN_Span 2
#define FWLTHEME_FORMBTN_Size 21
CFWL_FormTP::CFWL_FormTP() : m_pActiveBitmap(NULL), m_pDeactivebitmap(NULL) {
- m_pThemeData = FX_NEW SBThemeData;
+ m_pThemeData = new SBThemeData;
SetThemeData(0);
m_rtDisLBorder.Reset();
m_rtDisRBorder.Reset();
@@ -840,7 +840,7 @@ void CFWL_FormTP::InitCaption(FX_BOOL bActive) { delete m_pActiveBitmap;
m_pActiveBitmap = NULL;
}
- m_pActiveBitmap = FX_NEW CFX_DIBitmap;
+ m_pActiveBitmap = new CFX_DIBitmap;
m_pActiveBitmap->Create(1, FWLTHEME_CAPACITY_CYCaption, FXDIB_Argb);
dev.Attach(m_pActiveBitmap);
gs.Create(&dev);
@@ -865,7 +865,7 @@ void CFWL_FormTP::InitCaption(FX_BOOL bActive) { delete m_pDeactivebitmap;
m_pDeactivebitmap = NULL;
}
- m_pDeactivebitmap = FX_NEW CFX_DIBitmap;
+ m_pDeactivebitmap = new CFX_DIBitmap;
m_pDeactivebitmap->Create(1, FWLTHEME_CAPACITY_CYCaption, FXDIB_Argb);
dev.Attach(m_pDeactivebitmap);
gs.Create(&dev);
diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 67586f1b80..13f9251820 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -49,7 +49,7 @@ #define FWL_MC_WIDTH 200
#define FWL_MC_HEIGHT 160
CFWL_MonthCalendarTP::CFWL_MonthCalendarTP() {
- m_pThemeData = FX_NEW MCThemeData;
+ m_pThemeData = new MCThemeData;
SetThemeData(0);
}
CFWL_MonthCalendarTP::~CFWL_MonthCalendarTP() {
diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 5820113f3b..db77f3ef27 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -7,7 +7,7 @@ #include "../../../foxitlib.h"
#define PUSHBUTTON_SIZE_Corner 2
CFWL_PushButtonTP::CFWL_PushButtonTP() {
- m_pThemeData = FX_NEW PBThemeData;
+ m_pThemeData = new PBThemeData;
SetThemeData(0);
}
CFWL_PushButtonTP::~CFWL_PushButtonTP() {
diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index bc9f41913c..e0ad6a1531 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -7,7 +7,7 @@ #include "../../../foxitlib.h"
#define FWL_SCROLL_PawLen 12.5f
CFWL_ScrollBarTP::CFWL_ScrollBarTP() {
- m_pThemeData = FX_NEW SBThemeData;
+ m_pThemeData = new SBThemeData;
SetThemeData(0);
}
CFWL_ScrollBarTP::~CFWL_ScrollBarTP() {
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index 8d421b6209..bd21b4e761 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -665,7 +665,7 @@ CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(NULL) { CFWL_FontManager* FWL_GetFontManager() {
static CFWL_FontManager* _fontManager = NULL;
if (_fontManager == NULL) {
- _fontManager = FX_NEW CFWL_FontManager;
+ _fontManager = new CFWL_FontManager;
}
return _fontManager;
}
@@ -740,7 +740,7 @@ IFX_Font* CFWL_FontManager::FindFont(const CFX_WideStringC& wsFontFamily, return data->GetFont();
}
}
- CFWL_FontData* fontData = FX_NEW CFWL_FontData;
+ CFWL_FontData* fontData = new CFWL_FontData;
if (!fontData->LoadFont(wsFontFamily, dwFontStyles, wCodePage)) {
delete fontData;
return NULL;
@@ -767,7 +767,7 @@ FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor) { CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL;
CFWL_ArrowData* CFWL_ArrowData::GetInstance() {
if (!m_pInstance) {
- m_pInstance = FX_NEW CFWL_ArrowData;
+ m_pInstance = new CFWL_ArrowData;
}
return m_pInstance;
}
@@ -788,7 +788,7 @@ CFWL_ArrowData::~CFWL_ArrowData() { }
void CFWL_ArrowData::SetColorData(FX_DWORD dwID) {
if (!m_pColorData) {
- m_pColorData = FX_NEW CColorData;
+ m_pColorData = new CColorData;
}
if (dwID) {
m_pColorData->clrBorder[0] = ArgbEncode(255, 142, 153, 125);
diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp index 5b268abce6..03618e9f8a 100644 --- a/xfa/src/fxbarcode/BC_BarCode.cpp +++ b/xfa/src/fxbarcode/BC_BarCode.cpp @@ -174,17 +174,17 @@ void CBC_OneCode::SetFontColor(FX_ARGB color) { }
}
CBC_Code39::CBC_Code39() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCode39Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedCode39Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCode39Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedCode39Writer);
}
CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit) {
- m_pBCReader = (CBC_Reader*)FX_NEW CBC_OnedCode39Reader(usingCheckDigit);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode39Writer;
+ m_pBCReader = (CBC_Reader*)new CBC_OnedCode39Reader(usingCheckDigit);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode39Writer;
}
CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode) {
m_pBCReader =
- (CBC_Reader*)FX_NEW CBC_OnedCode39Reader(usingCheckDigit, extendedMode);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode39Writer(extendedMode);
+ (CBC_Reader*)new CBC_OnedCode39Reader(usingCheckDigit, extendedMode);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode39Writer(extendedMode);
}
CBC_Code39::~CBC_Code39() {
if (m_pBCReader) {
@@ -267,8 +267,8 @@ FX_BOOL CBC_Code39::SetWideNarrowRatio(int32_t ratio) { return FALSE;
}
CBC_Codabar::CBC_Codabar() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCodaBarReader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedCodaBarWriter);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCodaBarReader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedCodaBarWriter);
}
CBC_Codabar::~CBC_Codabar() {
if (m_pBCReader) {
@@ -358,8 +358,8 @@ CFX_WideString CBC_Codabar::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_Code128::CBC_Code128(BC_TYPE type) {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCode128Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode128Writer(type);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCode128Reader);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode128Writer(type);
}
CBC_Code128::~CBC_Code128() {
if (m_pBCReader) {
@@ -435,8 +435,8 @@ CFX_WideString CBC_Code128::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_EAN8::CBC_EAN8() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedEAN8Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedEAN8Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedEAN8Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedEAN8Writer);
}
CBC_EAN8::~CBC_EAN8() {
if (m_pBCReader) {
@@ -518,8 +518,8 @@ CFX_WideString CBC_EAN8::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_EAN13::CBC_EAN13() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedEAN13Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedEAN13Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedEAN13Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedEAN13Writer);
}
CBC_EAN13::~CBC_EAN13() {
if (m_pBCReader) {
@@ -602,9 +602,9 @@ CFX_WideString CBC_EAN13::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_UPCA::CBC_UPCA() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedUPCAReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedUPCAReader);
((CBC_OnedUPCAReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedUPCAWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedUPCAWriter);
}
CBC_UPCA::~CBC_UPCA() {
if (m_pBCReader) {
@@ -688,9 +688,9 @@ CFX_WideString CBC_UPCA::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_QRCode::CBC_QRCode() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_QRCodeReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_QRCodeReader);
((CBC_QRCodeReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_QRCodeWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_QRCodeWriter);
}
CBC_QRCode::~CBC_QRCode() {
if (m_pBCReader) {
@@ -762,8 +762,8 @@ CFX_WideString CBC_QRCode::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(retStr, retStr.GetLength());
}
CBC_PDF417I::CBC_PDF417I() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_PDF417Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_PDF417Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_PDF417Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_PDF417Writer);
}
CBC_PDF417I::~CBC_PDF417I() {
if (m_pBCReader) {
@@ -823,9 +823,9 @@ CFX_WideString CBC_PDF417I::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(bytestring, bytestring.GetLength());
}
CBC_DataMatrix::CBC_DataMatrix() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_DataMatrixReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_DataMatrixReader);
((CBC_DataMatrixReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_DataMatrixWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_DataMatrixWriter);
}
CBC_DataMatrix::~CBC_DataMatrix() {
if (m_pBCReader) {
diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp index 19f68b04e3..e626c4021c 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp @@ -38,7 +38,7 @@ static CFX_DIBitmap* CreateDIBSource(IFX_FileRead* fileread) { if (status != FXCODEC_STATUS_FRAME_READY) {
return NULL;
}
- bitmap = FX_NEW CFX_DIBitmap;
+ bitmap = new CFX_DIBitmap;
bitmap->Create(pImageCodec->GetWidth(), pImageCodec->GetHeight(), FXDIB_Argb);
bitmap->Clear(FXARGB_MAKE(0xFF, 0xFF, 0xFF, 0xFF));
CBC_Pause pause;
@@ -149,7 +149,7 @@ CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetRow(int32_t y, return &row;
}
CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetMatrix() {
- CFX_ByteArray* matirx = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* matirx = new CFX_ByteArray();
matirx->SetSize(m_bytesPerLine * m_height);
int32_t* rgb = (int32_t*)m_pBitmap->GetBuffer();
int32_t y;
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp index eba4f1436f..9cb97f4a54 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp @@ -131,7 +131,7 @@ void CBC_TwoDimWriter::RenderResult(uint8_t* code, if (topPadding < 0) {
topPadding = 0;
}
- m_output = FX_NEW CBC_CommonBitMatrix;
+ m_output = new CBC_CommonBitMatrix;
m_output->Init(outputWidth, outputHeight);
for (int32_t inputY = 0, outputY = topPadding;
(inputY < inputHeight) && (outputY < outputHeight - multiY);
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp index d7207016bb..3316377e02 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.cpp +++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp @@ -29,7 +29,7 @@ CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val, int32_t elements,
int32_t maxWidth,
FX_BOOL noNarrow) {
- CFX_Int32Array* iTemp = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* iTemp = new CFX_Int32Array;
iTemp->SetSize(elements);
CBC_AutoPtr<CFX_Int32Array> widths(iTemp);
int32_t bar;
@@ -131,7 +131,7 @@ int32_t CBC_UtilRSS::Combins(int32_t n, int32_t r) { CFX_Int32Array* CBC_UtilRSS::Elements(CFX_Int32Array& eDist,
int32_t N,
int32_t K) {
- CFX_Int32Array* widths = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* widths = new CFX_Int32Array;
widths->SetSize(eDist.GetSize() + 2);
int32_t twoK = K << 1;
(*widths)[0] = 1;
diff --git a/xfa/src/fxbarcode/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp index 80c3c6978f..e98c6f5537 100644 --- a/xfa/src/fxbarcode/BC_Writer.cpp +++ b/xfa/src/fxbarcode/BC_Writer.cpp @@ -51,7 +51,7 @@ void CBC_Writer::SetBarcodeColor(FX_ARGB foregroundColor) { }
CFX_DIBitmap* CBC_Writer::CreateDIBitmap(int32_t width, int32_t height) {
CFX_DIBitmap* pDIBitmap = NULL;
- pDIBitmap = FX_NEW CFX_DIBitmap;
+ pDIBitmap = new CFX_DIBitmap;
if (pDIBitmap != NULL) {
pDIBitmap->Create(width, height, m_colorSpace);
}
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index d5796d1263..0a0930d97c 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -108,9 +108,9 @@ CBC_CommonBitArray* CBC_CommonBitMatrix::GetRow(int32_t y, CBC_CommonBitArray* row) {
CBC_CommonBitArray* rowArray = NULL;
if (row == NULL || row->GetSize() < m_width) {
- rowArray = FX_NEW CBC_CommonBitArray(m_width);
+ rowArray = new CBC_CommonBitArray(m_width);
} else {
- rowArray = FX_NEW CBC_CommonBitArray(row);
+ rowArray = new CBC_CommonBitArray(row);
}
int32_t offset = y * m_rowSize;
int32_t x;
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index 498cca2dbb..50dd8fae5b 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -96,7 +96,7 @@ CBC_CommonPerspectiveTransform::SquareToQuadrilateral(FX_FLOAT x0, FX_FLOAT dy2 = y3 - y2;
FX_FLOAT dy3 = y0 - y1 + y2 - y3;
if ((dy2 == 0.0f) && (dy3 == 0.0f)) {
- return FX_NEW CBC_CommonPerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0,
+ return new CBC_CommonPerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0,
y2 - y1, y0, 0.0f, 0.0f, 1.0f);
} else {
FX_FLOAT dx1 = x1 - x2;
@@ -106,7 +106,7 @@ CBC_CommonPerspectiveTransform::SquareToQuadrilateral(FX_FLOAT x0, FX_FLOAT denominator = dx1 * dy2 - dx2 * dy1;
FX_FLOAT a13 = (dx3 * dy2 - dx2 * dy3) / denominator;
FX_FLOAT a23 = (dx1 * dy3 - dx3 * dy1) / denominator;
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
x1 - x0 + a13 * x1, x3 - x0 + a23 * x3, x0, y1 - y0 + a13 * y1,
y3 - y0 + a23 * y3, y0, a13, a23, 1.0f);
}
@@ -125,7 +125,7 @@ CBC_CommonPerspectiveTransform::QuadrilateralToSquare(FX_FLOAT x0, return temp1->BuildAdjoint();
}
CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::BuildAdjoint() {
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
m_a22 * m_a33 - m_a23 * m_a32, m_a23 * m_a31 - m_a21 * m_a33,
m_a21 * m_a32 - m_a22 * m_a31, m_a13 * m_a32 - m_a12 * m_a33,
m_a11 * m_a33 - m_a13 * m_a31, m_a12 * m_a31 - m_a11 * m_a32,
@@ -134,7 +134,7 @@ CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::BuildAdjoint() { }
CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::Times(
CBC_CommonPerspectiveTransform& other) {
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
m_a11 * other.m_a11 + m_a21 * other.m_a12 + m_a31 * other.m_a13,
m_a11 * other.m_a21 + m_a21 * other.m_a22 + m_a31 * other.m_a23,
m_a11 * other.m_a31 + m_a21 * other.m_a32 + m_a31 * other.m_a33,
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 88b0c43828..5a15c36f01 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -39,7 +39,7 @@ CBC_CommonBitArray* CBC_GlobalHistogramBinarizer::GetBlackRow( int32_t& e) {
CBC_LuminanceSource* source = GetLuminanceSource();
int32_t width = source->GetWidth();
- CBC_AutoPtr<CBC_CommonBitArray> result(FX_NEW CBC_CommonBitArray(width));
+ CBC_AutoPtr<CBC_CommonBitArray> result(new CBC_CommonBitArray(width));
InitArrays(width);
CFX_ByteArray* localLuminances = source->GetRow(y, m_luminance, e);
if (e != BCExceptionNO) {
@@ -73,7 +73,7 @@ CBC_CommonBitMatrix* CBC_GlobalHistogramBinarizer::GetBlackMatrix(int32_t& e) { CBC_LuminanceSource* source = GetLuminanceSource();
int32_t width = source->GetWidth();
int32_t height = source->GetHeight();
- CBC_CommonBitMatrix* BitMatrixTemp = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* BitMatrixTemp = new CBC_CommonBitMatrix();
BitMatrixTemp->Init(width, height);
CBC_AutoPtr<CBC_CommonBitMatrix> matrix(BitMatrixTemp);
InitArrays(width);
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp index 251eb5919c..368a12efd7 100644 --- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp +++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp @@ -196,7 +196,7 @@ CBC_ResultPoint* CBC_WhiteRectangleDetector::GetBlackPointOnSegment( int32_t x = Round(aX + i * xStep);
int32_t y = Round(aY + i * yStep);
if (m_image->Get(x, y)) {
- return FX_NEW CBC_ResultPoint((FX_FLOAT)x, (FX_FLOAT)y);
+ return new CBC_ResultPoint((FX_FLOAT)x, (FX_FLOAT)y);
}
}
return NULL;
@@ -222,20 +222,20 @@ CFX_PtrArray* CBC_WhiteRectangleDetector::CenterEdges(CBC_ResultPoint* y, float ti = t->GetX();
float tj = t->GetY();
if (yi < m_width / 2) {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
- (*result)[0] = FX_NEW CBC_ResultPoint(ti - CORR, tj + CORR);
- (*result)[1] = FX_NEW CBC_ResultPoint(zi + CORR, zj + CORR);
- (*result)[2] = FX_NEW CBC_ResultPoint(xi - CORR, xj - CORR);
- (*result)[3] = FX_NEW CBC_ResultPoint(yi + CORR, yj - CORR);
+ (*result)[0] = new CBC_ResultPoint(ti - CORR, tj + CORR);
+ (*result)[1] = new CBC_ResultPoint(zi + CORR, zj + CORR);
+ (*result)[2] = new CBC_ResultPoint(xi - CORR, xj - CORR);
+ (*result)[3] = new CBC_ResultPoint(yi + CORR, yj - CORR);
return result;
} else {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
- (*result)[0] = FX_NEW CBC_ResultPoint(ti + CORR, tj + CORR);
- (*result)[1] = FX_NEW CBC_ResultPoint(zi + CORR, zj - CORR);
- (*result)[2] = FX_NEW CBC_ResultPoint(xi - CORR, xj + CORR);
- (*result)[3] = FX_NEW CBC_ResultPoint(yi - CORR, yj - CORR);
+ (*result)[0] = new CBC_ResultPoint(ti + CORR, tj + CORR);
+ (*result)[1] = new CBC_ResultPoint(zi + CORR, zj - CORR);
+ (*result)[2] = new CBC_ResultPoint(xi - CORR, xj + CORR);
+ (*result)[3] = new CBC_ResultPoint(yi - CORR, yj - CORR);
return result;
}
}
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index 286906d152..c2ddd0f69f 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -28,7 +28,7 @@ CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) { m_field = field;
}
void CBC_ReedSolomonEncoder::Init() {
- m_cachedGenerators.Add(FX_NEW CBC_ReedSolomonGF256Poly(m_field, 1));
+ m_cachedGenerators.Add(new CBC_ReedSolomonGF256Poly(m_field, 1));
}
CBC_ReedSolomonGF256Poly* CBC_ReedSolomonEncoder::BuildGenerator(int32_t degree,
int32_t& e) {
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index d57efe1408..b072309a86 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -178,7 +178,7 @@ CFX_PtrArray* CBC_ReedSolomonDecoder::RunEuclideanAlgorithm( CBC_ReedSolomonGF256Poly* rsg14 = r->Multiply(inverse, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_AutoPtr<CBC_ReedSolomonGF256Poly> omega(rsg14);
- CFX_PtrArray* temp = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* temp = new CFX_PtrArray;
temp->Add(sigma.release());
temp->Add(omega.release());
return temp;
@@ -188,11 +188,11 @@ CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorLocations( int32_t& e) {
int32_t numErrors = errorLocator->GetDegree();
if (numErrors == 1) {
- CBC_AutoPtr<CFX_Int32Array> temp(FX_NEW CFX_Int32Array);
+ CBC_AutoPtr<CFX_Int32Array> temp(new CFX_Int32Array);
temp->Add(errorLocator->GetCoefficients(1));
return temp.release();
}
- CFX_Int32Array* tempT = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* tempT = new CFX_Int32Array;
tempT->SetSize(numErrors);
CBC_AutoPtr<CFX_Int32Array> result(tempT);
int32_t ie = 0;
@@ -215,7 +215,7 @@ CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorMagnitudes( FX_BOOL dataMatrix,
int32_t& e) {
int32_t s = errorLocations->GetSize();
- CFX_Int32Array* temp = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* temp = new CFX_Int32Array;
temp->SetSize(s);
CBC_AutoPtr<CFX_Int32Array> result(temp);
for (int32_t i = 0; i < s; i++) {
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index 43c8c82a4d..d862e9a931 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -26,9 +26,9 @@ CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL;
CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL;
void CBC_ReedSolomonGF256::Initialize() {
- QRCodeFild = FX_NEW CBC_ReedSolomonGF256(0x011D);
+ QRCodeFild = new CBC_ReedSolomonGF256(0x011D);
QRCodeFild->Init();
- DataMatrixField = FX_NEW CBC_ReedSolomonGF256(0x012D);
+ DataMatrixField = new CBC_ReedSolomonGF256(0x012D);
DataMatrixField->Init();
}
void CBC_ReedSolomonGF256::Finalize() {
@@ -56,8 +56,8 @@ CBC_ReedSolomonGF256::CBC_ReedSolomonGF256(int32_t primitive) { m_logTable[0] = 0;
}
void CBC_ReedSolomonGF256::Init() {
- m_zero = FX_NEW CBC_ReedSolomonGF256Poly(this, 0);
- m_one = FX_NEW CBC_ReedSolomonGF256Poly(this, 1);
+ m_zero = new CBC_ReedSolomonGF256Poly(this, 0);
+ m_one = new CBC_ReedSolomonGF256Poly(this, 1);
}
CBC_ReedSolomonGF256::~CBC_ReedSolomonGF256() {
if (m_zero != NULL) {
@@ -91,7 +91,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256::BuildMonomial( CFX_Int32Array coefficients;
coefficients.SetSize(degree + 1);
coefficients[0] = coefficient;
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(this, &coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index 1ab42eb831..127a20b4f9 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -93,7 +93,7 @@ int32_t CBC_ReedSolomonGF256Poly::EvaluateAt(int32_t a) { return result;
}
CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Clone(int32_t& e) {
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -130,7 +130,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::AddOrSubtract( sumDiff[j] = (CBC_ReedSolomonGF256::AddOrSubtract(
smallerCoefficients[j - lengthDiff], largerCoefficients[j]));
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &sumDiff, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -159,7 +159,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Multiply( m_field->Multiply(aCoeff, other->GetCoefficients()->operator[](j)));
}
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -181,7 +181,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Multiply(int32_t scalar, for (int32_t i = 0; i < size; i++) {
product[i] = m_field->Multiply(m_coefficients[i], scalar);
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -205,7 +205,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::MultiplyByMonomial( for (int32_t i = 0; i < size; i++) {
product[i] = (m_field->Multiply(m_coefficients[i], coefficient));
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -250,7 +250,7 @@ CFX_PtrArray* CBC_ReedSolomonGF256Poly::Divide(CBC_ReedSolomonGF256Poly* other, CBC_AutoPtr<CBC_ReedSolomonGF256Poly> temp1(rsg6);
remainder = temp1;
}
- CFX_PtrArray* tempPtrA = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* tempPtrA = new CFX_PtrArray;
tempPtrA->Add(quotient.release());
tempPtrA->Add(remainder.release());
return tempPtrA;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 16275a0c55..52738a1527 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -40,7 +40,7 @@ void CBC_DataMatrixBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, BC_EXCEPTION_CHECK_ReturnVoid(e);
m_mappingBitMatrix = ExtractDataRegion(bitMatrix, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- m_readMappingMatrix = FX_NEW CBC_CommonBitMatrix();
+ m_readMappingMatrix = new CBC_CommonBitMatrix();
m_readMappingMatrix->Init(m_mappingBitMatrix->GetWidth(),
m_mappingBitMatrix->GetHeight());
}
@@ -68,7 +68,7 @@ CBC_DataMatrixVersion* CBC_DataMatrixBitMatrixParser::ReadVersion( return temp;
}
CFX_ByteArray* CBC_DataMatrixBitMatrixParser::ReadCodewords(int32_t& e) {
- CBC_AutoPtr<CFX_ByteArray> result(FX_NEW CFX_ByteArray());
+ CBC_AutoPtr<CFX_ByteArray> result(new CFX_ByteArray());
result->SetSize(m_version->GetTotalCodewords());
int32_t resultOffset = 0;
int32_t row = 4;
@@ -350,7 +350,7 @@ CBC_CommonBitMatrix* CBC_DataMatrixBitMatrixParser::ExtractDataRegion( int32_t numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
int32_t sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
int32_t sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
- CBC_CommonBitMatrix* bitMatrixWithoutAlignment = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* bitMatrixWithoutAlignment = new CBC_CommonBitMatrix();
bitMatrixWithoutAlignment->Init(sizeDataRegionColumn, sizeDataRegionRow);
int32_t dataRegionRow;
for (dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index f9d991b32f..ef9f5582b6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -40,7 +40,7 @@ CFX_PtrArray* CBC_DataMatrixDataBlock::GetDataBlocks( for (i = 0; i < ecBlockArray.GetSize(); i++) {
totalBlocks += ((ECB*)ecBlockArray[i])->GetCount();
}
- CBC_AutoPtr<CFX_PtrArray> result(FX_NEW CFX_PtrArray());
+ CBC_AutoPtr<CFX_PtrArray> result(new CFX_PtrArray());
result->SetSize(totalBlocks);
int32_t numResultBlocks = 0;
int32_t j;
@@ -51,7 +51,7 @@ CFX_PtrArray* CBC_DataMatrixDataBlock::GetDataBlocks( CFX_ByteArray codewords;
codewords.SetSize(numBlockCodewords);
(*result)[numResultBlocks++] =
- FX_NEW CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
+ new CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
codewords.SetSize(0);
}
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 86a93d13ee..8ac6468b3a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -93,7 +93,7 @@ CBC_CommonDecoderResult* CBC_DataMatrixDecodedBitStreamParser::Decode( if (resultTrailer.GetLength() > 0) {
result += resultTrailer;
}
- CBC_CommonDecoderResult* tempCp = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCp = new CBC_CommonDecoderResult();
tempCp->Init(bytes, result,
(byteSegments.GetSize() <= 0) ? CFX_Int32Array() : byteSegments,
NULL, e);
@@ -457,7 +457,7 @@ void CBC_DataMatrixDecodedBitStreamParser::DecodeBase256Segment( e = BCExceptionFormatException;
return;
}
- CFX_ByteArray* bytes = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* bytes = new CFX_ByteArray();
bytes->SetSize(count);
int32_t i;
for (i = 0; i < count; i++) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index d0fe37f167..5767c95555 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -34,7 +34,7 @@ CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { }
void CBC_DataMatrixDecoder::Init() {
m_rsDecoder =
- FX_NEW CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
+ new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
}
CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() {
if (m_rsDecoder != NULL) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index 2dce972f9e..641d2761bb 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -32,7 +32,7 @@ const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
: m_image(image), m_rectangleDetector(NULL) {}
void CBC_DataMatrixDetector::Init(int32_t& e) {
- m_rectangleDetector = FX_NEW CBC_WhiteRectangleDetector(m_image);
+ m_rectangleDetector = new CBC_WhiteRectangleDetector(m_image);
m_rectangleDetector->Init(e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
}
@@ -191,13 +191,13 @@ CBC_QRDetectorResult* CBC_DataMatrixDetector::Detect(int32_t& e) { dimensionCorrected, dimensionCorrected, e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
}
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
result->Add(topLeft);
result->Add(bottomLeft);
result->Add(bottomRight);
result->Add(correctedTopRight.release());
- return FX_NEW CBC_QRDetectorResult(bits.release(), result);
+ return new CBC_QRDetectorResult(bits.release(), result);
}
CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular(
CBC_ResultPoint* bottomLeft,
@@ -210,13 +210,13 @@ CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular( int32_t norm = Distance(topLeft, topRight);
FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c1(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
corr = Distance(bottomLeft, topLeft) / (FX_FLOAT)dimensionRight;
norm = Distance(bottomRight, topRight);
cos = (topRight->GetX() - bottomRight->GetX()) / norm;
sin = (topRight->GetY() - bottomRight->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c2(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
if (!IsValid(c1.get())) {
if (IsValid(c2.get())) {
@@ -257,13 +257,13 @@ CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRight( int32_t norm = Distance(topLeft, topRight);
FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c1(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
norm = Distance(bottomRight, topRight);
cos = (topRight->GetX() - bottomRight->GetX()) / norm;
sin = (topRight->GetY() - bottomRight->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c2(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
if (!IsValid(c1.get())) {
if (IsValid(c2.get())) {
@@ -367,7 +367,7 @@ CBC_ResultPointsAndTransitions* CBC_DataMatrixDetector::TransitionsBetween( error -= dx;
}
}
- return FX_NEW CBC_ResultPointsAndTransitions(from, to, transitions);
+ return new CBC_ResultPointsAndTransitions(from, to, transitions);
}
void CBC_DataMatrixDetector::OrderBestPatterns(CFX_PtrArray* patterns) {
FX_FLOAT abDistance = (FX_FLOAT)Distance((CBC_ResultPoint*)(*patterns)[0],
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index 7e1777fa7b..4c4be46176 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -32,7 +32,7 @@ CBC_DataMatrixReader::CBC_DataMatrixReader() { m_decoder = NULL;
}
void CBC_DataMatrixReader::Init() {
- m_decoder = FX_NEW CBC_DataMatrixDecoder;
+ m_decoder = new CBC_DataMatrixDecoder;
m_decoder->Init();
}
CBC_DataMatrixReader::~CBC_DataMatrixReader() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp index 55b3c8d557..e642478571 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -24,7 +24,7 @@ #include "BC_DataMatrixVersion.h"
CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
void CBC_DataMatrixVersion::Initialize() {
- VERSIONS = FX_NEW CFX_PtrArray();
+ VERSIONS = new CFX_PtrArray();
}
void CBC_DataMatrixVersion::Finalize() {
for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
@@ -96,67 +96,67 @@ CBC_DataMatrixVersion* CBC_DataMatrixVersion::GetVersionForDimensions( return NULL;
}
if (VERSIONS->GetSize() == 0) {
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 1, 10, 10, 8, 8, FX_NEW ECBlocks(5, FX_NEW ECB(1, 3))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 2, 12, 12, 10, 10, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 3, 14, 14, 12, 12, FX_NEW ECBlocks(10, FX_NEW ECB(1, 8))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 4, 16, 16, 14, 14, FX_NEW ECBlocks(12, FX_NEW ECB(1, 12))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 5, 18, 18, 16, 16, FX_NEW ECBlocks(14, FX_NEW ECB(1, 18))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 6, 20, 20, 18, 18, FX_NEW ECBlocks(18, FX_NEW ECB(1, 22))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 7, 22, 22, 20, 20, FX_NEW ECBlocks(20, FX_NEW ECB(1, 30))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 8, 24, 24, 22, 22, FX_NEW ECBlocks(24, FX_NEW ECB(1, 36))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 9, 26, 26, 24, 24, FX_NEW ECBlocks(28, FX_NEW ECB(1, 44))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 10, 32, 32, 14, 14, FX_NEW ECBlocks(36, FX_NEW ECB(1, 62))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 11, 36, 36, 16, 16, FX_NEW ECBlocks(42, FX_NEW ECB(1, 86))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 12, 40, 40, 18, 18, FX_NEW ECBlocks(48, FX_NEW ECB(1, 114))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 13, 44, 44, 20, 20, FX_NEW ECBlocks(56, FX_NEW ECB(1, 144))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 14, 48, 48, 22, 22, FX_NEW ECBlocks(68, FX_NEW ECB(1, 174))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 15, 52, 52, 24, 24, FX_NEW ECBlocks(42, FX_NEW ECB(2, 102))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 16, 64, 64, 14, 14, FX_NEW ECBlocks(56, FX_NEW ECB(2, 140))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 17, 72, 72, 16, 16, FX_NEW ECBlocks(36, FX_NEW ECB(4, 92))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 18, 80, 80, 18, 18, FX_NEW ECBlocks(48, FX_NEW ECB(4, 114))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 19, 88, 88, 20, 20, FX_NEW ECBlocks(56, FX_NEW ECB(4, 144))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 20, 96, 96, 22, 22, FX_NEW ECBlocks(68, FX_NEW ECB(4, 174))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 21, 104, 104, 24, 24, FX_NEW ECBlocks(56, FX_NEW ECB(6, 136))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 22, 120, 120, 18, 18, FX_NEW ECBlocks(68, FX_NEW ECB(6, 175))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 23, 132, 132, 20, 20, FX_NEW ECBlocks(62, FX_NEW ECB(8, 163))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 1, 10, 10, 8, 8, new ECBlocks(5, new ECB(1, 3))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 2, 12, 12, 10, 10, new ECBlocks(7, new ECB(1, 5))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 3, 14, 14, 12, 12, new ECBlocks(10, new ECB(1, 8))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 4, 16, 16, 14, 14, new ECBlocks(12, new ECB(1, 12))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 5, 18, 18, 16, 16, new ECBlocks(14, new ECB(1, 18))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 6, 20, 20, 18, 18, new ECBlocks(18, new ECB(1, 22))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 7, 22, 22, 20, 20, new ECBlocks(20, new ECB(1, 30))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 8, 24, 24, 22, 22, new ECBlocks(24, new ECB(1, 36))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 9, 26, 26, 24, 24, new ECBlocks(28, new ECB(1, 44))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 10, 32, 32, 14, 14, new ECBlocks(36, new ECB(1, 62))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 11, 36, 36, 16, 16, new ECBlocks(42, new ECB(1, 86))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 12, 40, 40, 18, 18, new ECBlocks(48, new ECB(1, 114))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 13, 44, 44, 20, 20, new ECBlocks(56, new ECB(1, 144))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 14, 48, 48, 22, 22, new ECBlocks(68, new ECB(1, 174))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 15, 52, 52, 24, 24, new ECBlocks(42, new ECB(2, 102))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 16, 64, 64, 14, 14, new ECBlocks(56, new ECB(2, 140))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 17, 72, 72, 16, 16, new ECBlocks(36, new ECB(4, 92))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 18, 80, 80, 18, 18, new ECBlocks(48, new ECB(4, 114))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 19, 88, 88, 20, 20, new ECBlocks(56, new ECB(4, 144))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 20, 96, 96, 22, 22, new ECBlocks(68, new ECB(4, 174))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 21, 104, 104, 24, 24, new ECBlocks(56, new ECB(6, 136))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 22, 120, 120, 18, 18, new ECBlocks(68, new ECB(6, 175))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 23, 132, 132, 20, 20, new ECBlocks(62, new ECB(8, 163))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
24, 144, 144, 22, 22,
- FX_NEW ECBlocks(62, FX_NEW ECB(8, 156), FX_NEW ECB(2, 155))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 25, 8, 18, 6, 16, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 26, 8, 32, 6, 14, FX_NEW ECBlocks(11, FX_NEW ECB(1, 10))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 27, 12, 26, 10, 24, FX_NEW ECBlocks(14, FX_NEW ECB(1, 16))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 28, 12, 36, 10, 16, FX_NEW ECBlocks(18, FX_NEW ECB(1, 22))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 29, 16, 36, 14, 16, FX_NEW ECBlocks(24, FX_NEW ECB(1, 32))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 30, 16, 48, 14, 22, FX_NEW ECBlocks(28, FX_NEW ECB(1, 49))));
+ new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 25, 8, 18, 6, 16, new ECBlocks(7, new ECB(1, 5))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 26, 8, 32, 6, 14, new ECBlocks(11, new ECB(1, 10))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 27, 12, 26, 10, 24, new ECBlocks(14, new ECB(1, 16))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 28, 12, 36, 10, 16, new ECBlocks(18, new ECB(1, 22))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 29, 16, 36, 14, 16, new ECBlocks(24, new ECB(1, 32))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 30, 16, 48, 14, 22, new ECBlocks(28, new ECB(1, 49))));
}
int32_t numVersions = VERSIONS->GetSize();
for (int32_t i = 0; i < numVersions; ++i) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 539572f5da..20eaa4c223 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -72,7 +72,7 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents, CBC_ErrorCorrection::encodeECC200(encoded, symbolInfo, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_DefaultPlacement* placement =
- FX_NEW CBC_DefaultPlacement(codewords, symbolInfo->getSymbolDataWidth(e),
+ new CBC_DefaultPlacement(codewords, symbolInfo->getSymbolDataWidth(e),
symbolInfo->getSymbolDataHeight(e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
placement->place();
@@ -109,7 +109,7 @@ CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel( BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
int32_t symbolHeight = symbolInfo->getSymbolDataHeight(e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CBC_CommonByteMatrix* matrix = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* matrix = new CBC_CommonByteMatrix(
symbolInfo->getSymbolWidth(e), symbolInfo->getSymbolHeight(e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
matrix->Init();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 986d6b2a7f..4a0e09528b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -87,12 +87,12 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, context.m_pos += 6;
}
CFX_PtrArray encoders;
- encoders.Add(FX_NEW CBC_ASCIIEncoder());
- encoders.Add(FX_NEW CBC_C40Encoder());
- encoders.Add(FX_NEW CBC_TextEncoder());
- encoders.Add(FX_NEW CBC_X12Encoder());
- encoders.Add(FX_NEW CBC_EdifactEncoder());
- encoders.Add(FX_NEW CBC_Base256Encoder());
+ encoders.Add(new CBC_ASCIIEncoder());
+ encoders.Add(new CBC_C40Encoder());
+ encoders.Add(new CBC_TextEncoder());
+ encoders.Add(new CBC_X12Encoder());
+ encoders.Add(new CBC_EdifactEncoder());
+ encoders.Add(new CBC_Base256Encoder());
int32_t encodingMode = ASCII_ENCODATION;
while (context.hasMoreCharacters()) {
((CBC_Encoder*)encoders.GetAt(encodingMode))->Encode(context, e);
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 2ed4ee0003..68b5b4c674 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -37,45 +37,45 @@ CBC_SymbolInfo* CBC_SymbolInfo::m_symbols[30] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
void CBC_SymbolInfo::Initialize() {
- m_PROD_SYMBOLS[0] = FX_NEW CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
- m_PROD_SYMBOLS[1] = FX_NEW CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
- m_PROD_SYMBOLS[2] = FX_NEW CBC_SymbolInfo(TRUE, 5, 7, 16, 6, 1);
- m_PROD_SYMBOLS[3] = FX_NEW CBC_SymbolInfo(FALSE, 8, 10, 12, 12, 1);
- m_PROD_SYMBOLS[4] = FX_NEW CBC_SymbolInfo(TRUE, 10, 11, 14, 6, 2);
- m_PROD_SYMBOLS[5] = FX_NEW CBC_SymbolInfo(FALSE, 12, 12, 14, 14, 1);
- m_PROD_SYMBOLS[6] = FX_NEW CBC_SymbolInfo(TRUE, 16, 14, 24, 10, 1);
- m_PROD_SYMBOLS[7] = FX_NEW CBC_SymbolInfo(FALSE, 18, 14, 16, 16, 1);
- m_PROD_SYMBOLS[8] = FX_NEW CBC_SymbolInfo(FALSE, 22, 18, 18, 18, 1);
- m_PROD_SYMBOLS[9] = FX_NEW CBC_SymbolInfo(TRUE, 22, 18, 16, 10, 2);
- m_PROD_SYMBOLS[10] = FX_NEW CBC_SymbolInfo(FALSE, 30, 20, 20, 20, 1);
- m_PROD_SYMBOLS[11] = FX_NEW CBC_SymbolInfo(TRUE, 32, 24, 16, 14, 2);
- m_PROD_SYMBOLS[12] = FX_NEW CBC_SymbolInfo(FALSE, 36, 24, 22, 22, 1);
- m_PROD_SYMBOLS[13] = FX_NEW CBC_SymbolInfo(FALSE, 44, 28, 24, 24, 1);
- m_PROD_SYMBOLS[14] = FX_NEW CBC_SymbolInfo(TRUE, 49, 28, 22, 14, 2);
- m_PROD_SYMBOLS[15] = FX_NEW CBC_SymbolInfo(FALSE, 62, 36, 14, 14, 4);
- m_PROD_SYMBOLS[16] = FX_NEW CBC_SymbolInfo(FALSE, 86, 42, 16, 16, 4);
- m_PROD_SYMBOLS[17] = FX_NEW CBC_SymbolInfo(FALSE, 114, 48, 18, 18, 4);
- m_PROD_SYMBOLS[18] = FX_NEW CBC_SymbolInfo(FALSE, 144, 56, 20, 20, 4);
- m_PROD_SYMBOLS[19] = FX_NEW CBC_SymbolInfo(FALSE, 174, 68, 22, 22, 4);
+ m_PROD_SYMBOLS[0] = new CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
+ m_PROD_SYMBOLS[1] = new CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
+ m_PROD_SYMBOLS[2] = new CBC_SymbolInfo(TRUE, 5, 7, 16, 6, 1);
+ m_PROD_SYMBOLS[3] = new CBC_SymbolInfo(FALSE, 8, 10, 12, 12, 1);
+ m_PROD_SYMBOLS[4] = new CBC_SymbolInfo(TRUE, 10, 11, 14, 6, 2);
+ m_PROD_SYMBOLS[5] = new CBC_SymbolInfo(FALSE, 12, 12, 14, 14, 1);
+ m_PROD_SYMBOLS[6] = new CBC_SymbolInfo(TRUE, 16, 14, 24, 10, 1);
+ m_PROD_SYMBOLS[7] = new CBC_SymbolInfo(FALSE, 18, 14, 16, 16, 1);
+ m_PROD_SYMBOLS[8] = new CBC_SymbolInfo(FALSE, 22, 18, 18, 18, 1);
+ m_PROD_SYMBOLS[9] = new CBC_SymbolInfo(TRUE, 22, 18, 16, 10, 2);
+ m_PROD_SYMBOLS[10] = new CBC_SymbolInfo(FALSE, 30, 20, 20, 20, 1);
+ m_PROD_SYMBOLS[11] = new CBC_SymbolInfo(TRUE, 32, 24, 16, 14, 2);
+ m_PROD_SYMBOLS[12] = new CBC_SymbolInfo(FALSE, 36, 24, 22, 22, 1);
+ m_PROD_SYMBOLS[13] = new CBC_SymbolInfo(FALSE, 44, 28, 24, 24, 1);
+ m_PROD_SYMBOLS[14] = new CBC_SymbolInfo(TRUE, 49, 28, 22, 14, 2);
+ m_PROD_SYMBOLS[15] = new CBC_SymbolInfo(FALSE, 62, 36, 14, 14, 4);
+ m_PROD_SYMBOLS[16] = new CBC_SymbolInfo(FALSE, 86, 42, 16, 16, 4);
+ m_PROD_SYMBOLS[17] = new CBC_SymbolInfo(FALSE, 114, 48, 18, 18, 4);
+ m_PROD_SYMBOLS[18] = new CBC_SymbolInfo(FALSE, 144, 56, 20, 20, 4);
+ m_PROD_SYMBOLS[19] = new CBC_SymbolInfo(FALSE, 174, 68, 22, 22, 4);
m_PROD_SYMBOLS[20] =
- FX_NEW CBC_SymbolInfo(FALSE, 204, 84, 24, 24, 4, 102, 42);
+ new CBC_SymbolInfo(FALSE, 204, 84, 24, 24, 4, 102, 42);
m_PROD_SYMBOLS[21] =
- FX_NEW CBC_SymbolInfo(FALSE, 280, 112, 14, 14, 16, 140, 56);
+ new CBC_SymbolInfo(FALSE, 280, 112, 14, 14, 16, 140, 56);
m_PROD_SYMBOLS[22] =
- FX_NEW CBC_SymbolInfo(FALSE, 368, 144, 16, 16, 16, 92, 36);
+ new CBC_SymbolInfo(FALSE, 368, 144, 16, 16, 16, 92, 36);
m_PROD_SYMBOLS[23] =
- FX_NEW CBC_SymbolInfo(FALSE, 456, 192, 18, 18, 16, 114, 48);
+ new CBC_SymbolInfo(FALSE, 456, 192, 18, 18, 16, 114, 48);
m_PROD_SYMBOLS[24] =
- FX_NEW CBC_SymbolInfo(FALSE, 576, 224, 20, 20, 16, 144, 56);
+ new CBC_SymbolInfo(FALSE, 576, 224, 20, 20, 16, 144, 56);
m_PROD_SYMBOLS[25] =
- FX_NEW CBC_SymbolInfo(FALSE, 696, 272, 22, 22, 16, 174, 68);
+ new CBC_SymbolInfo(FALSE, 696, 272, 22, 22, 16, 174, 68);
m_PROD_SYMBOLS[26] =
- FX_NEW CBC_SymbolInfo(FALSE, 816, 336, 24, 24, 16, 136, 56);
+ new CBC_SymbolInfo(FALSE, 816, 336, 24, 24, 16, 136, 56);
m_PROD_SYMBOLS[27] =
- FX_NEW CBC_SymbolInfo(FALSE, 1050, 408, 18, 18, 36, 175, 68);
+ new CBC_SymbolInfo(FALSE, 1050, 408, 18, 18, 36, 175, 68);
m_PROD_SYMBOLS[28] =
- FX_NEW CBC_SymbolInfo(FALSE, 1304, 496, 20, 20, 36, 163, 62);
- m_PROD_SYMBOLS[29] = FX_NEW CBC_DataMatrixSymbolInfo144();
+ new CBC_SymbolInfo(FALSE, 1304, 496, 20, 20, 36, 163, 62);
+ m_PROD_SYMBOLS[29] = new CBC_DataMatrixSymbolInfo144();
for (int32_t i = 0; i < SYMBOLS_COUNT; i++) {
m_symbols[i] = m_PROD_SYMBOLS[i];
}
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index b0ad088637..77c34802b5 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -167,7 +167,7 @@ CFX_Int32Array* CBC_OneDimReader::FindGuardPattern(CBC_CommonBitArray* row, if (counterPosition == patternLength - 1) {
if (PatternMatchVariance(&counters, &(*pattern)[0],
MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* result = new CFX_Int32Array();
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = x;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 06b7d759cd..aaab954380 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -424,7 +424,7 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents, if (!isDevice) {
m_barWidth = codeLength * m_multiple;
}
- m_output = FX_NEW CBC_CommonBitMatrix;
+ m_output = new CBC_CommonBitMatrix;
m_output->Init(outputWidth, outputHeight);
int32_t outputX = leftPadding * m_multiple;
for (int32_t inputX = 0; inputX < codeOldLength; inputX++) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp index ed12f676b4..010406be8d 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp @@ -144,7 +144,7 @@ CFX_Int32Array* CBC_OnedCodaBarReader::FindAsteriskPattern( patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (btemp3) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* result = new CFX_Int32Array();
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index 4cffe9d78f..c1f74c8a61 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -119,7 +119,7 @@ CFX_Int32Array* CBC_OnedCode128Reader::FindStartPattern(CBC_CommonBitArray* row, patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (btemp2) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(3);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index 3678260033..9caa0cb43a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -150,7 +150,7 @@ CFX_Int32Array* CBC_OnedCode39Reader::FindAsteriskPattern( patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (bT1) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp index fd427eae64..d02e2a2966 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -30,7 +30,7 @@ CBC_OnedUPCAReader::CBC_OnedUPCAReader() { m_ean13Reader = NULL;
}
void CBC_OnedUPCAReader::Init() {
- m_ean13Reader = FX_NEW CBC_OnedEAN13Reader;
+ m_ean13Reader = new CBC_OnedEAN13Reader;
}
CBC_OnedUPCAReader::~CBC_OnedUPCAReader() {
if (m_ean13Reader != NULL) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 66c7c2a798..da15a06d1a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -31,7 +31,7 @@ CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() { m_bRightPadding = TRUE;
}
void CBC_OnedUPCAWriter::Init() {
- m_subWriter = FX_NEW CBC_OnedEAN13Writer;
+ m_subWriter = new CBC_OnedEAN13Writer;
}
CBC_OnedUPCAWriter::~CBC_OnedUPCAWriter() {
if (m_subWriter != NULL) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp index c31ebf61e1..f38758f4bc 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -445,7 +445,7 @@ void CBC_PDF417::generateBarcodeLogic(CFX_WideString msg, dataCodewords, errorCorrectionLevel, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
CFX_WideString fullCodewords = dataCodewords + ec;
- m_barcodeMatrix = FX_NEW CBC_BarcodeMatrix(rows, cols);
+ m_barcodeMatrix = new CBC_BarcodeMatrix(rows, cols);
encodeLowLevel(fullCodewords, cols, rows, errorCorrectionLevel,
m_barcodeMatrix);
}
@@ -561,7 +561,7 @@ CFX_Int32Array* CBC_PDF417::determineDimensions( if (dimension) {
delete dimension;
}
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(cols);
dimension->Add(rows);
}
@@ -569,11 +569,11 @@ CFX_Int32Array* CBC_PDF417::determineDimensions( int32_t rows = calculateNumberOfRows(sourceCodeWords,
errorCorrectionCodeWords, m_minCols);
if (rows < m_minRows) {
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(m_minCols);
dimension->Add(m_minRows);
} else if (rows >= 3 && rows <= 90) {
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(m_minCols);
dimension->Add(rows);
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 583a86e596..2386ba4e2e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -27,7 +27,7 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { m_matrix.SetSize(height + 2);
for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength;
i++) {
- m_matrix[i] = FX_NEW CBC_BarcodeRow((width + 4) * 17 + 1);
+ m_matrix[i] = new CBC_BarcodeRow((width + 4) * 17 + 1);
}
m_width = width * 17;
m_height = height + 2;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 5397c4f36f..2bb3c45a18 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -40,7 +40,7 @@ void CBC_BarcodeValue::setValue(int32_t value) { }
CFX_Int32Array* CBC_BarcodeValue::getValue() {
int32_t maxConfidence = -1;
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
for (int32_t i = 0; i < m_keys.GetSize(); i++) {
if (m_values.GetAt(i) > maxConfidence) {
maxConfidence = m_values.GetAt(i);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 0801bbcd11..8aef43f989 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -61,14 +61,14 @@ CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox, int32_t& e) {
CBC_BoundingBox* boundingBox = NULL;
if (leftBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(rightBox);
+ boundingBox = new CBC_BoundingBox(rightBox);
return boundingBox;
}
if (rightBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(leftBox);
+ boundingBox = new CBC_BoundingBox(leftBox);
return boundingBox;
}
- boundingBox = FX_NEW CBC_BoundingBox(
+ boundingBox = new CBC_BoundingBox(
leftBox->m_image, leftBox->m_topLeft, leftBox->m_bottomLeft,
rightBox->m_topRight, rightBox->m_bottomRight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -90,7 +90,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, if (newMinY < 0) {
newMinY = 0;
}
- newTop = FX_NEW CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
+ newTop = new CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
if (isLeft) {
newTopLeft = newTop;
} else {
@@ -104,7 +104,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, newMaxY = m_image->GetHeight() - 1;
}
newBottom =
- FX_NEW CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
+ new CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
if (isLeft) {
newBottomLeft = newBottom;
} else {
@@ -112,7 +112,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, }
}
calculateMinMaxValues();
- CBC_BoundingBox* boundingBox = FX_NEW CBC_BoundingBox(
+ CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
m_image, newTopLeft, newBottomLeft, newTopRight, newBottomRight, e);
delete newTop;
delete newBottom;
@@ -123,7 +123,7 @@ void CBC_BoundingBox::setTopRight(CBC_ResultPoint topRight) { if (m_topRight) {
delete m_topRight;
}
- m_topRight = FX_NEW CBC_ResultPoint(topRight.GetX(), topRight.GetY());
+ m_topRight = new CBC_ResultPoint(topRight.GetX(), topRight.GetY());
calculateMinMaxValues();
}
void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) {
@@ -131,7 +131,7 @@ void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) { delete m_bottomRight;
}
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
+ new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
calculateMinMaxValues();
}
int32_t CBC_BoundingBox::getMinX() {
@@ -169,29 +169,29 @@ void CBC_BoundingBox::init(CBC_CommonBitMatrix* image, m_bottomRight = NULL;
m_image = image;
if (topLeft) {
- m_topLeft = FX_NEW CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
+ m_topLeft = new CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
}
if (bottomLeft) {
m_bottomLeft =
- FX_NEW CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
+ new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
}
if (topRight) {
- m_topRight = FX_NEW CBC_ResultPoint(topRight->GetX(), topRight->GetY());
+ m_topRight = new CBC_ResultPoint(topRight->GetX(), topRight->GetY());
}
if (bottomRight) {
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
+ new CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
}
calculateMinMaxValues();
}
void CBC_BoundingBox::calculateMinMaxValues() {
if (m_topLeft == NULL) {
- m_topLeft = FX_NEW CBC_ResultPoint(0, m_topRight->GetY());
- m_bottomLeft = FX_NEW CBC_ResultPoint(0, m_bottomRight->GetY());
+ m_topLeft = new CBC_ResultPoint(0, m_topRight->GetY());
+ m_bottomLeft = new CBC_ResultPoint(0, m_bottomRight->GetY());
} else if (m_topRight == NULL) {
- m_topRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_topRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_topLeft->GetY());
- m_bottomRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_bottomRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_bottomLeft->GetY());
}
m_minX = (int32_t)(m_topLeft->GetX() < m_bottomLeft->GetX()
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index 6e7d26b4af..d70dbb12e4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -59,7 +59,7 @@ CFX_Int32Array* CBC_PDF417CodewordDecoder::sampleBitCounts( CFX_Int32Array& moduleBitCount) {
FX_FLOAT bitCountSum =
(FX_FLOAT)CBC_PDF417Common::getBitCountSum(moduleBitCount);
- CFX_Int32Array* bitCount = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* bitCount = new CFX_Int32Array();
bitCount->SetSize(CBC_PDF417Common::BARS_IN_MODULE);
int32_t bitCountIndex = 0;
int32_t sumPreviousBits = 0;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index 5002a991fd..e14b2b37c4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -64,7 +64,7 @@ CBC_CommonDecoderResult* CBC_DecodedBitStreamPaser::decode( int32_t codeIndex = 1;
int32_t code = codewords.GetAt(codeIndex);
codeIndex++;
- CBC_PDF417ResultMetadata* resultMetadata = FX_NEW CBC_PDF417ResultMetadata;
+ CBC_PDF417ResultMetadata* resultMetadata = new CBC_PDF417ResultMetadata;
while (codeIndex < codewords[0]) {
switch (code) {
case TEXT_COMPACTION_MODE_LATCH:
@@ -110,7 +110,7 @@ CBC_CommonDecoderResult* CBC_DecodedBitStreamPaser::decode( }
CFX_ByteArray rawBytes;
CFX_PtrArray byteSegments;
- CBC_CommonDecoderResult* tempCd = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
tempCd->Init(rawBytes, result, byteSegments, ecLevel, e);
if (e != BCExceptionNO) {
delete resultMetadata;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index d58220fa3a..9252c33011 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -28,7 +28,7 @@ int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5; CBC_DetectionResultColumn::CBC_DetectionResultColumn(
CBC_BoundingBox* boundingBox) {
m_boundingBox = boundingBox;
- m_codewords = FX_NEW CFX_PtrArray;
+ m_codewords = new CFX_PtrArray;
m_codewords->SetSize(boundingBox->getMaxY() - boundingBox->getMinY() + 1);
}
CBC_DetectionResultColumn::~CBC_DetectionResultColumn() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index 843e8a90a5..bc3fb4c9bd 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -113,7 +113,7 @@ CFX_Int32Array* CBC_DetectionResultRowIndicatorColumn::getRowHeights( return NULL;
}
adjustIncompleteIndicatorColumnRowNumbers(*barcodeMetadata);
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(barcodeMetadata->getRowCount());
for (int32_t i = 0; i < getCodewords()->GetSize(); i++) {
CBC_Codeword* codeword = (CBC_Codeword*)getCodewords()->GetAt(i);
@@ -209,7 +209,7 @@ CBC_DetectionResultRowIndicatorColumn::getBarcodeMetadata() { return NULL;
}
CBC_BarcodeMetadata* barcodeMetadata =
- FX_NEW CBC_BarcodeMetadata(barcodeColumnCount.getValue()->GetAt(0),
+ new CBC_BarcodeMetadata(barcodeColumnCount.getValue()->GetAt(0),
barcodeRowCountUpperPart.getValue()->GetAt(0),
barcodeRowCountLowerPart.getValue()->GetAt(0),
barcodeECLevel.getValue()->GetAt(0));
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp index 24ef935430..7f3940d101 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -62,15 +62,15 @@ CBC_PDF417DetectorResult* CBC_Detector::detect(CBC_BinaryBitmap* image, BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
}
CBC_PDF417DetectorResult* detectorResult =
- FX_NEW CBC_PDF417DetectorResult(bitMatrix, barcodeCoordinates);
+ new CBC_PDF417DetectorResult(bitMatrix, barcodeCoordinates);
return detectorResult;
}
void CBC_Detector::rotate180(CBC_CommonBitMatrix* bitMatrix) {
int32_t width = bitMatrix->GetWidth();
int32_t height = bitMatrix->GetHeight();
- CBC_CommonBitArray* firstRowBitArray = FX_NEW CBC_CommonBitArray(width);
- CBC_CommonBitArray* secondRowBitArray = FX_NEW CBC_CommonBitArray(width);
- CBC_CommonBitArray* tmpBitArray = FX_NEW CBC_CommonBitArray(width);
+ CBC_CommonBitArray* firstRowBitArray = new CBC_CommonBitArray(width);
+ CBC_CommonBitArray* secondRowBitArray = new CBC_CommonBitArray(width);
+ CBC_CommonBitArray* tmpBitArray = new CBC_CommonBitArray(width);
for (int32_t y = 0; y<(height + 1)>> 1; y++) {
CBC_CommonBitArray* temp =
bitMatrix->GetRow(height - 1 - y, secondRowBitArray);
@@ -91,7 +91,7 @@ void CBC_Detector::rotate180(CBC_CommonBitMatrix* bitMatrix) { }
CBC_CommonBitArray* CBC_Detector::mirror(CBC_CommonBitArray* input,
CBC_CommonBitArray* result) {
- CBC_CommonBitArray* array = FX_NEW CBC_CommonBitArray(result->GetSize());
+ CBC_CommonBitArray* array = new CBC_CommonBitArray(result->GetSize());
array->Clear();
int32_t size = input->GetSize();
for (int32_t i = 0; i < size; i++) {
@@ -103,7 +103,7 @@ CBC_CommonBitArray* CBC_Detector::mirror(CBC_CommonBitArray* input, }
CFX_PtrArray* CBC_Detector::detect(FX_BOOL multiple,
CBC_CommonBitMatrix* bitMatrix) {
- CFX_PtrArray* barcodeCoordinates = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* barcodeCoordinates = new CFX_PtrArray;
int32_t row = 0;
int32_t column = 0;
FX_BOOL foundBarcodeInRow = FALSE;
@@ -154,7 +154,7 @@ CFX_PtrArray* CBC_Detector::findVertices(CBC_CommonBitMatrix* matrix, int32_t startColumn) {
int32_t height = matrix->GetHeight();
int32_t width = matrix->GetWidth();
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(8);
CFX_PtrArray* startptr = findRowsWithPattern(
matrix, height, width, startRow, startColumn, START_PATTERN,
@@ -192,7 +192,7 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, int32_t startColumn,
int32_t* pattern,
int32_t patternLength) {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
FX_BOOL found = FALSE;
CFX_Int32Array counters;
@@ -214,9 +214,9 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, break;
}
}
- result->SetAt(0, FX_NEW CBC_ResultPoint((FX_FLOAT)loc->GetAt(0),
+ result->SetAt(0, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(0),
(FX_FLOAT)startRow));
- result->SetAt(1, FX_NEW CBC_ResultPoint((FX_FLOAT)loc->GetAt(1),
+ result->SetAt(1, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(1),
(FX_FLOAT)startRow));
found = TRUE;
delete loc;
@@ -249,9 +249,9 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, delete loc;
}
stopRow -= skippedRowCount + 1;
- result->SetAt(2, FX_NEW CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(0),
+ result->SetAt(2, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(0),
(FX_FLOAT)stopRow));
- result->SetAt(3, FX_NEW CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(1),
+ result->SetAt(3, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(1),
(FX_FLOAT)stopRow));
}
if (stopRow - startRow < BARCODE_MIN_HEIGHT) {
@@ -275,7 +275,7 @@ CFX_Int32Array* CBC_Detector::findGuardPattern(CBC_CommonBitMatrix* matrix, FX_BOOL isWhite = whiteFirst;
int32_t patternStart = column;
int32_t pixelDrift = 0;
- CFX_Int32Array* intarray = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* intarray = new CFX_Int32Array;
while (matrix->Get(patternStart, row) && patternStart > 0 &&
pixelDrift++ < MAX_PIXEL_DRIFT) {
patternStart--;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index 344e4b8d5b..a0d8b697d0 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -28,7 +28,7 @@ CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL;
void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) {
m_field =
- FX_NEW CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
+ new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
}
void CBC_PDF417ECErrorCorrection::Finalize() {
delete m_field;
@@ -55,7 +55,7 @@ int32_t CBC_PDF417ECErrorCorrection::decode(CFX_Int32Array& received, return 0;
}
CBC_PDF417ECModulusPoly* syndrome =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, S, e);
+ new CBC_PDF417ECModulusPoly(m_field, S, e);
BC_EXCEPTION_CHECK_ReturnValue(e, -1);
CBC_PDF417ECModulusPoly* buildmonomial =
m_field->buildMonomial(numECCodewords, 1, e);
@@ -321,7 +321,7 @@ CFX_PtrArray* CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm( delete rtemp;
}
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CFX_PtrArray* modulusPoly = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* modulusPoly = new CFX_PtrArray;
modulusPoly->Add(sigma);
modulusPoly->Add(omega);
return modulusPoly;
@@ -330,7 +330,7 @@ CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorLocations( CBC_PDF417ECModulusPoly* errorLocator,
int32_t& e) {
int32_t numErrors = errorLocator->getDegree();
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(numErrors);
int32_t ee = 0;
for (int32_t i = 1; i < m_field->getSize() && ee < numErrors; i++) {
@@ -366,7 +366,7 @@ CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorMagnitudes( formalDerivativeCoefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
int32_t s = errorLocations.GetSize();
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(s);
for (int32_t i = 0; i < s; i++) {
int32_t xiInverse = m_field->inverse(errorLocations[i], e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index 029a5e5946..6f3462cb1c 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -27,7 +27,7 @@ CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL;
void CBC_PDF417ECModulusGF::Initialize(int32_t& e) {
PDF417_GF =
- FX_NEW CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
+ new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
}
void CBC_PDF417ECModulusGF::Finalize() {
delete PDF417_GF;
@@ -48,10 +48,10 @@ CBC_PDF417ECModulusGF::CBC_PDF417ECModulusGF(int32_t modulus, }
CFX_Int32Array zero;
zero.Add(0);
- m_zero = FX_NEW CBC_PDF417ECModulusPoly(this, zero, e);
+ m_zero = new CBC_PDF417ECModulusPoly(this, zero, e);
CFX_Int32Array one;
one.Add(1);
- m_one = FX_NEW CBC_PDF417ECModulusPoly(this, one, e);
+ m_one = new CBC_PDF417ECModulusPoly(this, one, e);
}
CBC_PDF417ECModulusGF::~CBC_PDF417ECModulusGF() {
delete m_zero;
@@ -73,7 +73,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::buildMonomial( }
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (coefficient == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_zero->getField(),
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_zero->getField(),
m_zero->getCoefficients(), e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
@@ -81,7 +81,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::buildMonomial( CFX_Int32Array coefficients;
coefficients.SetSize(degree + 1);
coefficients[0] = coefficient;
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(this, coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(this, coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp index f05a4a05fc..423a70029e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp @@ -93,13 +93,13 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::add( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(other->getField(),
+ modulusPoly = new CBC_PDF417ECModulusPoly(other->getField(),
other->getCoefficients(), e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
if (other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -124,7 +124,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::add( sumDiff[i] = m_field->add(smallerCoefficients[i - lengthDiff],
largerCoefficients[i]);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, sumDiff, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, sumDiff, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -133,7 +133,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::subtract( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -149,7 +149,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (isZero() || other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->getField(), m_field->getZero()->getCoefficients(),
e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -170,7 +170,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply( product[i + j], m_field->multiply(aCoeff, bCoefficients[j]));
}
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -182,7 +182,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::negative(int32_t& e) { negativeCoefficients[i] = m_field->subtract(0, m_coefficients[i]);
}
CBC_PDF417ECModulusPoly* modulusPoly =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, negativeCoefficients, e);
+ new CBC_PDF417ECModulusPoly(m_field, negativeCoefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -190,14 +190,14 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(int32_t scalar, int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (scalar == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->getField(), m_field->getZero()->getCoefficients(),
e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
if (scalar == 1) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -207,7 +207,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(int32_t scalar, for (int32_t i = 0; i < size; i++) {
product[i] = m_field->multiply(m_coefficients[i], scalar);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -221,7 +221,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiplyByMonomial( }
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (coefficient == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
@@ -232,7 +232,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiplyByMonomial( for (int32_t i = 0; i < size; i++) {
product[i] = m_field->multiply(m_coefficients[i], coefficient);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -242,11 +242,11 @@ CFX_PtrArray* CBC_PDF417ECModulusPoly::divide(CBC_PDF417ECModulusPoly* other, e = BCExceptionDivideByZero;
return NULL;
}
- CBC_PDF417ECModulusPoly* quotient = FX_NEW CBC_PDF417ECModulusPoly(
+ CBC_PDF417ECModulusPoly* quotient = new CBC_PDF417ECModulusPoly(
m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_PDF417ECModulusPoly* remainder =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
if (e != BCExceptionNO) {
delete quotient;
return NULL;
@@ -296,7 +296,7 @@ CFX_PtrArray* CBC_PDF417ECModulusPoly::divide(CBC_PDF417ECModulusPoly* other, return NULL;
}
}
- CFX_PtrArray* modulusPoly = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* modulusPoly = new CFX_PtrArray;
modulusPoly->Add(quotient);
modulusPoly->Add(remainder);
return modulusPoly;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 781fdb81d0..7427b311c9 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -47,7 +47,7 @@ CBC_PDF417ECErrorCorrection* CBC_PDF417ScanningDecoder::errorCorrection = NULL; CBC_PDF417ScanningDecoder::CBC_PDF417ScanningDecoder() {}
CBC_PDF417ScanningDecoder::~CBC_PDF417ScanningDecoder() {}
void CBC_PDF417ScanningDecoder::Initialize() {
- errorCorrection = FX_NEW CBC_PDF417ECErrorCorrection;
+ errorCorrection = new CBC_PDF417ECErrorCorrection;
}
void CBC_PDF417ScanningDecoder::Finalize() {
delete errorCorrection;
@@ -61,7 +61,7 @@ CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decode( int32_t minCodewordWidth,
int32_t maxCodewordWidth,
int32_t& e) {
- CBC_BoundingBox* boundingBox = FX_NEW CBC_BoundingBox(
+ CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
image, imageTopLeft, imageBottomLeft, imageTopRight, imageBottomRight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn = NULL;
@@ -111,10 +111,10 @@ CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decode( }
CBC_DetectionResultColumn* detectionResultColumn = NULL;
if (barcodeColumn == 0 || barcodeColumn == maxBarcodeColumn) {
- detectionResultColumn = FX_NEW CBC_DetectionResultRowIndicatorColumn(
+ detectionResultColumn = new CBC_DetectionResultRowIndicatorColumn(
boundingBox, barcodeColumn == 0);
} else {
- detectionResultColumn = FX_NEW CBC_DetectionResultColumn(boundingBox);
+ detectionResultColumn = new CBC_DetectionResultColumn(boundingBox);
}
detectionResult->setDetectionResultColumn(barcodeColumn,
detectionResultColumn);
@@ -207,7 +207,7 @@ CBC_DetectionResult* CBC_PDF417ScanningDecoder::merge( return NULL;
}
CBC_DetectionResult* detectionresult =
- FX_NEW CBC_DetectionResult(barcodeMetadata, boundingBox);
+ new CBC_DetectionResult(barcodeMetadata, boundingBox);
return detectionresult;
}
CBC_BoundingBox* CBC_PDF417ScanningDecoder::adjustBoundingBox(
@@ -297,7 +297,7 @@ CBC_PDF417ScanningDecoder::getRowIndicatorColumn(CBC_CommonBitMatrix* image, int32_t minCodewordWidth,
int32_t maxCodewordWidth) {
CBC_DetectionResultRowIndicatorColumn* rowIndicatorColumn =
- FX_NEW CBC_DetectionResultRowIndicatorColumn(boundingBox, leftToRight);
+ new CBC_DetectionResultRowIndicatorColumn(boundingBox, leftToRight);
for (int32_t i = 0; i < 2; i++) {
int32_t increment = i == 0 ? 1 : -1;
int32_t startColumn = (int32_t)startPoint.GetX();
@@ -459,16 +459,16 @@ CBC_PDF417ScanningDecoder::createDecoderResultFromAmbiguousValues( }
CFX_PtrArray* CBC_PDF417ScanningDecoder::createBarcodeMatrix(
CBC_DetectionResult* detectionResult) {
- CFX_PtrArray* barcodeMatrix = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* barcodeMatrix = new CFX_PtrArray;
barcodeMatrix->SetSize(detectionResult->getBarcodeRowCount());
CFX_PtrArray* temp = NULL;
int32_t colume = 0;
for (int32_t row = 0; row < barcodeMatrix->GetSize(); row++) {
- temp = FX_NEW CFX_PtrArray;
+ temp = new CFX_PtrArray;
temp->SetSize(detectionResult->getBarcodeColumnCount() + 2);
for (colume = 0; colume < detectionResult->getBarcodeColumnCount() + 2;
colume++) {
- temp->SetAt(colume, FX_NEW CBC_BarcodeValue());
+ temp->SetAt(colume, new CBC_BarcodeValue());
}
barcodeMatrix->SetAt(row, temp);
}
@@ -590,7 +590,7 @@ CBC_Codeword* CBC_PDF417ScanningDecoder::detectCodeword( if (codeword == -1) {
return NULL;
}
- return FX_NEW CBC_Codeword(startColumn, endColumn,
+ return new CBC_Codeword(startColumn, endColumn,
getCodewordBucketNumber(decodedValue), codeword);
}
CFX_Int32Array* CBC_PDF417ScanningDecoder::getModuleBitCount(
@@ -601,7 +601,7 @@ CFX_Int32Array* CBC_PDF417ScanningDecoder::getModuleBitCount( int32_t startColumn,
int32_t imageRow) {
int32_t imageColumn = startColumn;
- CFX_Int32Array* moduleBitCount = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* moduleBitCount = new CFX_Int32Array;
moduleBitCount->SetSize(8);
int32_t moduleNumber = 0;
int32_t increment = leftToRight ? 1 : -1;
@@ -721,7 +721,7 @@ void CBC_PDF417ScanningDecoder::verifyCodewordCount(CFX_Int32Array& codewords, }
CFX_Int32Array* CBC_PDF417ScanningDecoder::getBitCountForCodeword(
int32_t codeword) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(8);
int32_t previousValue = 0;
int32_t i = result->GetSize() - 1;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 72738cd8d9..79066fe83e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -45,5 +45,5 @@ FX_BOOL CBC_QRAlignmentPattern::AboutEquals(FX_FLOAT moduleSize, return FALSE;
}
CBC_QRAlignmentPattern* CBC_QRAlignmentPattern::Clone() {
- return FX_NEW CBC_QRAlignmentPattern(m_x, m_y, m_moduleSize);
+ return new CBC_QRAlignmentPattern(m_x, m_y, m_moduleSize);
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index 6c08f42b07..f8af90b106 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -192,12 +192,12 @@ CBC_QRAlignmentPattern* CBC_QRAlignmentPatternFinder::HandlePossibleCenter( CBC_QRAlignmentPattern* center =
(CBC_QRAlignmentPattern*)(m_possibleCenters[index]);
if (center->AboutEquals(estimatedModuleSize, centerI, centerJ)) {
- return FX_NEW CBC_QRAlignmentPattern(centerJ, centerI,
+ return new CBC_QRAlignmentPattern(centerJ, centerI,
estimatedModuleSize);
}
}
m_possibleCenters.Add(
- FX_NEW CBC_QRAlignmentPattern(centerJ, centerI, estimatedModuleSize));
+ new CBC_QRAlignmentPattern(centerJ, centerI, estimatedModuleSize));
}
return NULL;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index f0e03e656d..ad8bd566bf 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -147,7 +147,7 @@ CFX_ByteArray* CBC_QRBitMatrixParser::ReadCodewords(int32_t& e) { BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_AutoPtr<CBC_CommonBitMatrix> functionPattern(cbm);
FX_BOOL readingUp = TRUE;
- CFX_ByteArray* temp = FX_NEW CFX_ByteArray;
+ CFX_ByteArray* temp = new CFX_ByteArray;
temp->SetSize(version->GetTotalCodeWords());
CBC_AutoPtr<CFX_ByteArray> result(temp);
int32_t resultOffset = 0;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index f3ea7eab7d..05635917bd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -42,7 +42,7 @@ #include "BC_QRCoderVersion.h"
CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {}
void CBC_QRCodeReader::Init() {
- m_decoder = FX_NEW CBC_QRCoderDecoder;
+ m_decoder = new CBC_QRCoderDecoder;
m_decoder->Init();
}
CBC_QRCodeReader::~CBC_QRCodeReader() {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index f03adf5030..e78d266277 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -36,7 +36,7 @@ CBC_QRCoderDecoder::CBC_QRCoderDecoder() { }
void CBC_QRCoderDecoder::Init() {
- m_rsDecoder = FX_NEW CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::QRCodeFild);
+ m_rsDecoder = new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::QRCodeFild);
}
CBC_QRCoderDecoder::~CBC_QRCoderDecoder() {
if (m_rsDecoder != NULL) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index 8263640f31..f084660d8a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -146,7 +146,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index += 2;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sGBK,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sGBK,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -170,7 +170,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, }
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sBYTE,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sBYTE,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -182,7 +182,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index++;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sNUMERIC,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sNUMERIC,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -194,7 +194,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index++;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sALPHANUMERIC,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sALPHANUMERIC,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -405,7 +405,7 @@ void CBC_QRCoderEncoder::EncodeWithSpecifyVersion( qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -496,7 +496,7 @@ catchException: qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -547,7 +547,7 @@ void CBC_QRCoderEncoder::Encode(const CFX_WideString& content, qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -870,12 +870,12 @@ void CBC_QRCoderEncoder::InterleaveWithECBytes(CBC_QRCoderBitVector* bits, GetNumDataBytesAndNumECBytesForBlockID(numTotalBytes, numDataBytes,
numRSBlocks, i, numDataBytesInBlock,
numEcBytesInBlosk);
- CBC_CommonByteArray* dataBytes = FX_NEW CBC_CommonByteArray;
+ CBC_CommonByteArray* dataBytes = new CBC_CommonByteArray;
dataBytes->Set(bits->GetArray(), dataBytesOffset, numDataBytesInBlock);
CBC_CommonByteArray* ecBytes =
GenerateECBytes(dataBytes, numEcBytesInBlosk, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- blocks.Add(FX_NEW CBC_QRCoderBlockPair(dataBytes, ecBytes));
+ blocks.Add(new CBC_QRCoderBlockPair(dataBytes, ecBytes));
maxNumDataBytes = FX_MAX(maxNumDataBytes, dataBytes->Size());
maxNumEcBytes = FX_MAX(maxNumEcBytes, ecBytes->Size());
dataBytesOffset += numDataBytesInBlock;
@@ -952,7 +952,7 @@ CBC_CommonByteArray* CBC_QRCoderEncoder::GenerateECBytes( encode.Init();
encode.Encode(&toEncode, numEcBytesInBlock, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CBC_CommonByteArray* ecBytes = FX_NEW CBC_CommonByteArray(numEcBytesInBlock);
+ CBC_CommonByteArray* ecBytes = new CBC_CommonByteArray(numEcBytesInBlock);
for (int32_t j = 0; j < numEcBytesInBlock; j++) {
ecBytes->Set(j, toEncode[numDataBytes + j]);
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 0f43ab2939..52265000c1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -36,10 +36,10 @@ CBC_QRCoderErrorCorrectionLevel::CBC_QRCoderErrorCorrectionLevel( }
CBC_QRCoderErrorCorrectionLevel::~CBC_QRCoderErrorCorrectionLevel() {}
void CBC_QRCoderErrorCorrectionLevel::Initialize() {
- L = FX_NEW CBC_QRCoderErrorCorrectionLevel(0, 0x01, (FX_CHAR*)"L");
- M = FX_NEW CBC_QRCoderErrorCorrectionLevel(1, 0x00, (FX_CHAR*)"M");
- Q = FX_NEW CBC_QRCoderErrorCorrectionLevel(2, 0x03, (FX_CHAR*)"Q");
- H = FX_NEW CBC_QRCoderErrorCorrectionLevel(3, 0x02, (FX_CHAR*)"H");
+ L = new CBC_QRCoderErrorCorrectionLevel(0, 0x01, (FX_CHAR*)"L");
+ M = new CBC_QRCoderErrorCorrectionLevel(1, 0x00, (FX_CHAR*)"M");
+ Q = new CBC_QRCoderErrorCorrectionLevel(2, 0x03, (FX_CHAR*)"Q");
+ H = new CBC_QRCoderErrorCorrectionLevel(3, 0x02, (FX_CHAR*)"H");
}
void CBC_QRCoderErrorCorrectionLevel::Finalize() {
delete L;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 07d8d7187a..7f605c3ea5 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -79,7 +79,7 @@ CBC_QRCoderFormatInformation::DoDecodeFormatInformation( int32_t const* decodeInfo = &FORMAT_INFO_DECODE_LOOKUP[i][0];
int32_t targetInfo = decodeInfo[0];
if (targetInfo == maskedFormatInfo) {
- return FX_NEW CBC_QRCoderFormatInformation(decodeInfo[1]);
+ return new CBC_QRCoderFormatInformation(decodeInfo[1]);
}
int32_t bitsDifference = NumBitsDiffering(maskedFormatInfo, targetInfo);
if (bitsDifference < bestDifference) {
@@ -88,7 +88,7 @@ CBC_QRCoderFormatInformation::DoDecodeFormatInformation( }
}
if (bestDifference <= 3) {
- return FX_NEW CBC_QRCoderFormatInformation(bestFormatInfo);
+ return new CBC_QRCoderFormatInformation(bestFormatInfo);
}
return NULL;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 542c8dad00..e910c3fb6c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -54,22 +54,22 @@ CBC_QRCoderMode::~CBC_QRCoderMode() { }
}
void CBC_QRCoderMode::Initialize() {
- sBYTE = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 16, 16, 0x4, "BYTE");
- sALPHANUMERIC = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 9, 11, 13, 0x2,
+ sBYTE = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 16, 16, 0x4, "BYTE");
+ sALPHANUMERIC = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 9, 11, 13, 0x2,
"ALPHANUMERIC");
- sECI = FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x7, "ECI");
+ sECI = new CBC_QRCoderMode(NULL, 0, 0, 0, 0x7, "ECI");
sKANJI =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x8, "KANJI");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x8, "KANJI");
sNUMERIC =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 10, 12, 14, 0x1, "NUMERIC");
- sGBK = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x0D, "GBK");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 10, 12, 14, 0x1, "NUMERIC");
+ sGBK = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x0D, "GBK");
sTERMINATOR =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0, 0x00, "TERMINATOR");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0, 0x00, "TERMINATOR");
sFNC1_FIRST_POSITION =
- FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x05, "FNC1_FIRST_POSITION");
+ new CBC_QRCoderMode(NULL, 0, 0, 0, 0x05, "FNC1_FIRST_POSITION");
sFNC1_SECOND_POSITION =
- FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x09, "FNC1_SECOND_POSITION");
- sSTRUCTURED_APPEND = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0,
+ new CBC_QRCoderMode(NULL, 0, 0, 0, 0x09, "FNC1_SECOND_POSITION");
+ sSTRUCTURED_APPEND = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0,
0x03, "STRUCTURED_APPEND");
}
void CBC_QRCoderMode::Finalize() {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 6a3f122ce0..a357bf71a4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -37,7 +37,7 @@ const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = { 0x2379F, 0x24B0B, 0x2542E, 0x26A64, 0x27541, 0x28C69};
CFX_PtrArray* CBC_QRCoderVersion::VERSION = NULL;
void CBC_QRCoderVersion::Initialize() {
- VERSION = FX_NEW CFX_PtrArray();
+ VERSION = new CFX_PtrArray();
}
void CBC_QRCoderVersion::Finalize() {
for (int32_t i = 0; i < VERSION->GetSize(); i++) {
@@ -390,7 +390,7 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::DecodeVersionInformation( }
CBC_CommonBitMatrix* CBC_QRCoderVersion::BuildFunctionPattern(int32_t& e) {
int32_t dimension = GetDimensionForVersion();
- CBC_CommonBitMatrix* bitMatrix = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* bitMatrix = new CBC_CommonBitMatrix();
bitMatrix->Init(dimension);
bitMatrix->SetRegion(0, 0, 9, 9, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -425,334 +425,334 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::GetVersionForNumber( int32_t versionNumber,
int32_t& e) {
if (VERSION->GetSize() == 0) {
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 1, FX_NEW CBC_QRCoderECBlocks(7, FX_NEW CBC_QRCoderECB(1, 19)),
- FX_NEW CBC_QRCoderECBlocks(10, FX_NEW CBC_QRCoderECB(1, 16)),
- FX_NEW CBC_QRCoderECBlocks(13, FX_NEW CBC_QRCoderECB(1, 13)),
- FX_NEW CBC_QRCoderECBlocks(17, FX_NEW CBC_QRCoderECB(1, 9))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 2, FX_NEW CBC_QRCoderECBlocks(10, FX_NEW CBC_QRCoderECB(1, 34)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(1, 28)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(1, 22)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 3, FX_NEW CBC_QRCoderECBlocks(15, FX_NEW CBC_QRCoderECB(1, 55)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(1, 44)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 17)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 4, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(1, 80)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 32)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(2, 24)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(4, 9))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 5, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(1, 108)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 43)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 15),
- FX_NEW CBC_QRCoderECB(2, 16)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 11),
- FX_NEW CBC_QRCoderECB(2, 12))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 6, FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 68)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(4, 27)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 19)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 7, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(2, 78)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(4, 31)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(4, 15)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 13),
- FX_NEW CBC_QRCoderECB(1, 14))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 8, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 97)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 38),
- FX_NEW CBC_QRCoderECB(2, 39)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(4, 18),
- FX_NEW CBC_QRCoderECB(2, 19)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 14),
- FX_NEW CBC_QRCoderECB(2, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 9, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(2, 116)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(3, 36),
- FX_NEW CBC_QRCoderECB(2, 37)),
- FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(4, 16),
- FX_NEW CBC_QRCoderECB(4, 17)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 12),
- FX_NEW CBC_QRCoderECB(4, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 10, FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 68),
- FX_NEW CBC_QRCoderECB(2, 69)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 43),
- FX_NEW CBC_QRCoderECB(1, 44)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(6, 19),
- FX_NEW CBC_QRCoderECB(2, 20)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 15),
- FX_NEW CBC_QRCoderECB(2, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 11, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(4, 81)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(1, 50),
- FX_NEW CBC_QRCoderECB(4, 51)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 22),
- FX_NEW CBC_QRCoderECB(4, 23)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(3, 12),
- FX_NEW CBC_QRCoderECB(8, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 12, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 92),
- FX_NEW CBC_QRCoderECB(2, 93)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(6, 36),
- FX_NEW CBC_QRCoderECB(2, 37)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 20),
- FX_NEW CBC_QRCoderECB(6, 21)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(7, 14),
- FX_NEW CBC_QRCoderECB(4, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 13, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 107)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(8, 37),
- FX_NEW CBC_QRCoderECB(1, 38)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(8, 20),
- FX_NEW CBC_QRCoderECB(4, 21)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(12, 11),
- FX_NEW CBC_QRCoderECB(4, 12))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 14, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 115),
- FX_NEW CBC_QRCoderECB(1, 116)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 40),
- FX_NEW CBC_QRCoderECB(5, 41)),
- FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(11, 16),
- FX_NEW CBC_QRCoderECB(5, 17)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(11, 12),
- FX_NEW CBC_QRCoderECB(5, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 15, FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(5, 87),
- FX_NEW CBC_QRCoderECB(1, 88)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(5, 41),
- FX_NEW CBC_QRCoderECB(5, 42)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 24),
- FX_NEW CBC_QRCoderECB(7, 25)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(11, 12),
- FX_NEW CBC_QRCoderECB(7, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 16, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(5, 98),
- FX_NEW CBC_QRCoderECB(1, 99)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(7, 45),
- FX_NEW CBC_QRCoderECB(3, 46)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(15, 19),
- FX_NEW CBC_QRCoderECB(2, 20)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 15),
- FX_NEW CBC_QRCoderECB(13, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 17, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 107),
- FX_NEW CBC_QRCoderECB(5, 108)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 46),
- FX_NEW CBC_QRCoderECB(1, 47)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 22),
- FX_NEW CBC_QRCoderECB(15, 23)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(17, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 18, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 120),
- FX_NEW CBC_QRCoderECB(1, 121)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(9, 43),
- FX_NEW CBC_QRCoderECB(4, 44)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 22),
- FX_NEW CBC_QRCoderECB(1, 23)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(19, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 19, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 113),
- FX_NEW CBC_QRCoderECB(4, 114)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(3, 44),
- FX_NEW CBC_QRCoderECB(11, 45)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(17, 21),
- FX_NEW CBC_QRCoderECB(4, 22)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(9, 13),
- FX_NEW CBC_QRCoderECB(16, 14))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 20, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 107),
- FX_NEW CBC_QRCoderECB(5, 108)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(3, 41),
- FX_NEW CBC_QRCoderECB(13, 42)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(15, 24),
- FX_NEW CBC_QRCoderECB(5, 25)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(15, 15),
- FX_NEW CBC_QRCoderECB(10, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 21, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 116),
- FX_NEW CBC_QRCoderECB(4, 117)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(17, 42)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 22),
- FX_NEW CBC_QRCoderECB(6, 23)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 16),
- FX_NEW CBC_QRCoderECB(6, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 22, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 111),
- FX_NEW CBC_QRCoderECB(7, 112)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 24),
- FX_NEW CBC_QRCoderECB(16, 25)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(34, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 23, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 121),
- FX_NEW CBC_QRCoderECB(5, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 47),
- FX_NEW CBC_QRCoderECB(14, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(16, 15),
- FX_NEW CBC_QRCoderECB(14, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 24, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(6, 117),
- FX_NEW CBC_QRCoderECB(4, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 45),
- FX_NEW CBC_QRCoderECB(14, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 24),
- FX_NEW CBC_QRCoderECB(16, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(30, 16),
- FX_NEW CBC_QRCoderECB(2, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 25, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(8, 106),
- FX_NEW CBC_QRCoderECB(4, 107)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(8, 47),
- FX_NEW CBC_QRCoderECB(13, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 24),
- FX_NEW CBC_QRCoderECB(22, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(22, 15),
- FX_NEW CBC_QRCoderECB(13, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 26, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 114),
- FX_NEW CBC_QRCoderECB(2, 115)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(19, 46),
- FX_NEW CBC_QRCoderECB(4, 47)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(28, 22),
- FX_NEW CBC_QRCoderECB(6, 23)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(33, 16),
- FX_NEW CBC_QRCoderECB(4, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 27, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(8, 122),
- FX_NEW CBC_QRCoderECB(4, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(22, 45),
- FX_NEW CBC_QRCoderECB(3, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(8, 23),
- FX_NEW CBC_QRCoderECB(26, 24)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(12, 15),
- FX_NEW CBC_QRCoderECB(28, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 28, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 117),
- FX_NEW CBC_QRCoderECB(10, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 45),
- FX_NEW CBC_QRCoderECB(23, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 24),
- FX_NEW CBC_QRCoderECB(31, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 15),
- FX_NEW CBC_QRCoderECB(31, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 29, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 116),
- FX_NEW CBC_QRCoderECB(7, 117)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(21, 45),
- FX_NEW CBC_QRCoderECB(7, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(1, 23),
- FX_NEW CBC_QRCoderECB(37, 24)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 15),
- FX_NEW CBC_QRCoderECB(26, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 30, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 115),
- FX_NEW CBC_QRCoderECB(10, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(19, 47),
- FX_NEW CBC_QRCoderECB(10, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(15, 24),
- FX_NEW CBC_QRCoderECB(25, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(23, 15),
- FX_NEW CBC_QRCoderECB(25, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 31, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(13, 115),
- FX_NEW CBC_QRCoderECB(3, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 46),
- FX_NEW CBC_QRCoderECB(29, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(42, 24),
- FX_NEW CBC_QRCoderECB(1, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(23, 15),
- FX_NEW CBC_QRCoderECB(28, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 32, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 115)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 46),
- FX_NEW CBC_QRCoderECB(23, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(10, 24),
- FX_NEW CBC_QRCoderECB(35, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 15),
- FX_NEW CBC_QRCoderECB(35, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 33, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 115),
- FX_NEW CBC_QRCoderECB(1, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(14, 46),
- FX_NEW CBC_QRCoderECB(21, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(29, 24),
- FX_NEW CBC_QRCoderECB(19, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 15),
- FX_NEW CBC_QRCoderECB(46, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 34, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(13, 115),
- FX_NEW CBC_QRCoderECB(6, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(14, 46),
- FX_NEW CBC_QRCoderECB(23, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(44, 24),
- FX_NEW CBC_QRCoderECB(7, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(59, 16),
- FX_NEW CBC_QRCoderECB(1, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 35, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(12, 121),
- FX_NEW CBC_QRCoderECB(7, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(12, 47),
- FX_NEW CBC_QRCoderECB(26, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(39, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(22, 15),
- FX_NEW CBC_QRCoderECB(41, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 36, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(6, 121),
- FX_NEW CBC_QRCoderECB(14, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 47),
- FX_NEW CBC_QRCoderECB(34, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(46, 24),
- FX_NEW CBC_QRCoderECB(10, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(2, 15),
- FX_NEW CBC_QRCoderECB(64, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 37, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 122),
- FX_NEW CBC_QRCoderECB(4, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(29, 46),
- FX_NEW CBC_QRCoderECB(14, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(49, 24),
- FX_NEW CBC_QRCoderECB(10, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(24, 15),
- FX_NEW CBC_QRCoderECB(46, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 38, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 122),
- FX_NEW CBC_QRCoderECB(18, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(13, 46),
- FX_NEW CBC_QRCoderECB(32, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(48, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(42, 15),
- FX_NEW CBC_QRCoderECB(32, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 39, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(20, 117),
- FX_NEW CBC_QRCoderECB(4, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(40, 47),
- FX_NEW CBC_QRCoderECB(7, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(43, 24),
- FX_NEW CBC_QRCoderECB(22, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(10, 15),
- FX_NEW CBC_QRCoderECB(67, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 40, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 118),
- FX_NEW CBC_QRCoderECB(6, 119)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(18, 47),
- FX_NEW CBC_QRCoderECB(31, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(34, 24),
- FX_NEW CBC_QRCoderECB(34, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(20, 15),
- FX_NEW CBC_QRCoderECB(61, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 1, new CBC_QRCoderECBlocks(7, new CBC_QRCoderECB(1, 19)),
+ new CBC_QRCoderECBlocks(10, new CBC_QRCoderECB(1, 16)),
+ new CBC_QRCoderECBlocks(13, new CBC_QRCoderECB(1, 13)),
+ new CBC_QRCoderECBlocks(17, new CBC_QRCoderECB(1, 9))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 2, new CBC_QRCoderECBlocks(10, new CBC_QRCoderECB(1, 34)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(1, 28)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(1, 22)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 3, new CBC_QRCoderECBlocks(15, new CBC_QRCoderECB(1, 55)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(1, 44)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 17)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 4, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(1, 80)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 32)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(2, 24)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(4, 9))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 5, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(1, 108)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 43)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 15),
+ new CBC_QRCoderECB(2, 16)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 11),
+ new CBC_QRCoderECB(2, 12))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 6, new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 68)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(4, 27)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 19)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 7, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(2, 78)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(4, 31)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(4, 15)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 13),
+ new CBC_QRCoderECB(1, 14))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 8, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 97)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 38),
+ new CBC_QRCoderECB(2, 39)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(4, 18),
+ new CBC_QRCoderECB(2, 19)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 14),
+ new CBC_QRCoderECB(2, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 9, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(2, 116)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(3, 36),
+ new CBC_QRCoderECB(2, 37)),
+ new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(4, 16),
+ new CBC_QRCoderECB(4, 17)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 12),
+ new CBC_QRCoderECB(4, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 10, new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 68),
+ new CBC_QRCoderECB(2, 69)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 43),
+ new CBC_QRCoderECB(1, 44)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(6, 19),
+ new CBC_QRCoderECB(2, 20)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 15),
+ new CBC_QRCoderECB(2, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 11, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(4, 81)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(1, 50),
+ new CBC_QRCoderECB(4, 51)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 22),
+ new CBC_QRCoderECB(4, 23)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(3, 12),
+ new CBC_QRCoderECB(8, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 12, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 92),
+ new CBC_QRCoderECB(2, 93)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(6, 36),
+ new CBC_QRCoderECB(2, 37)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 20),
+ new CBC_QRCoderECB(6, 21)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(7, 14),
+ new CBC_QRCoderECB(4, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 13, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 107)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(8, 37),
+ new CBC_QRCoderECB(1, 38)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(8, 20),
+ new CBC_QRCoderECB(4, 21)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(12, 11),
+ new CBC_QRCoderECB(4, 12))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 14, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 115),
+ new CBC_QRCoderECB(1, 116)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 40),
+ new CBC_QRCoderECB(5, 41)),
+ new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(11, 16),
+ new CBC_QRCoderECB(5, 17)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(11, 12),
+ new CBC_QRCoderECB(5, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 15, new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(5, 87),
+ new CBC_QRCoderECB(1, 88)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(5, 41),
+ new CBC_QRCoderECB(5, 42)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 24),
+ new CBC_QRCoderECB(7, 25)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(11, 12),
+ new CBC_QRCoderECB(7, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 16, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(5, 98),
+ new CBC_QRCoderECB(1, 99)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(7, 45),
+ new CBC_QRCoderECB(3, 46)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(15, 19),
+ new CBC_QRCoderECB(2, 20)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 15),
+ new CBC_QRCoderECB(13, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 17, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 107),
+ new CBC_QRCoderECB(5, 108)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 46),
+ new CBC_QRCoderECB(1, 47)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 22),
+ new CBC_QRCoderECB(15, 23)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(17, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 18, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 120),
+ new CBC_QRCoderECB(1, 121)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(9, 43),
+ new CBC_QRCoderECB(4, 44)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 22),
+ new CBC_QRCoderECB(1, 23)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(19, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 19, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 113),
+ new CBC_QRCoderECB(4, 114)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(3, 44),
+ new CBC_QRCoderECB(11, 45)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(17, 21),
+ new CBC_QRCoderECB(4, 22)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(9, 13),
+ new CBC_QRCoderECB(16, 14))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 20, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 107),
+ new CBC_QRCoderECB(5, 108)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(3, 41),
+ new CBC_QRCoderECB(13, 42)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(15, 24),
+ new CBC_QRCoderECB(5, 25)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(15, 15),
+ new CBC_QRCoderECB(10, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 21, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 116),
+ new CBC_QRCoderECB(4, 117)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(17, 42)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 22),
+ new CBC_QRCoderECB(6, 23)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 16),
+ new CBC_QRCoderECB(6, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 22, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 111),
+ new CBC_QRCoderECB(7, 112)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 24),
+ new CBC_QRCoderECB(16, 25)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(34, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 23, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 121),
+ new CBC_QRCoderECB(5, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 47),
+ new CBC_QRCoderECB(14, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(16, 15),
+ new CBC_QRCoderECB(14, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 24, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(6, 117),
+ new CBC_QRCoderECB(4, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 45),
+ new CBC_QRCoderECB(14, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 24),
+ new CBC_QRCoderECB(16, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(30, 16),
+ new CBC_QRCoderECB(2, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 25, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(8, 106),
+ new CBC_QRCoderECB(4, 107)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(8, 47),
+ new CBC_QRCoderECB(13, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 24),
+ new CBC_QRCoderECB(22, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(22, 15),
+ new CBC_QRCoderECB(13, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 26, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 114),
+ new CBC_QRCoderECB(2, 115)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(19, 46),
+ new CBC_QRCoderECB(4, 47)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(28, 22),
+ new CBC_QRCoderECB(6, 23)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(33, 16),
+ new CBC_QRCoderECB(4, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 27, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(8, 122),
+ new CBC_QRCoderECB(4, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(22, 45),
+ new CBC_QRCoderECB(3, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(8, 23),
+ new CBC_QRCoderECB(26, 24)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(12, 15),
+ new CBC_QRCoderECB(28, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 28, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 117),
+ new CBC_QRCoderECB(10, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 45),
+ new CBC_QRCoderECB(23, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 24),
+ new CBC_QRCoderECB(31, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 15),
+ new CBC_QRCoderECB(31, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 29, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 116),
+ new CBC_QRCoderECB(7, 117)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(21, 45),
+ new CBC_QRCoderECB(7, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(1, 23),
+ new CBC_QRCoderECB(37, 24)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 15),
+ new CBC_QRCoderECB(26, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 30, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 115),
+ new CBC_QRCoderECB(10, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(19, 47),
+ new CBC_QRCoderECB(10, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(15, 24),
+ new CBC_QRCoderECB(25, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(23, 15),
+ new CBC_QRCoderECB(25, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 31, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(13, 115),
+ new CBC_QRCoderECB(3, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 46),
+ new CBC_QRCoderECB(29, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(42, 24),
+ new CBC_QRCoderECB(1, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(23, 15),
+ new CBC_QRCoderECB(28, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 32, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 115)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 46),
+ new CBC_QRCoderECB(23, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(10, 24),
+ new CBC_QRCoderECB(35, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 15),
+ new CBC_QRCoderECB(35, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 33, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 115),
+ new CBC_QRCoderECB(1, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(14, 46),
+ new CBC_QRCoderECB(21, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(29, 24),
+ new CBC_QRCoderECB(19, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 15),
+ new CBC_QRCoderECB(46, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 34, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(13, 115),
+ new CBC_QRCoderECB(6, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(14, 46),
+ new CBC_QRCoderECB(23, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(44, 24),
+ new CBC_QRCoderECB(7, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(59, 16),
+ new CBC_QRCoderECB(1, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 35, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(12, 121),
+ new CBC_QRCoderECB(7, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(12, 47),
+ new CBC_QRCoderECB(26, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(39, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(22, 15),
+ new CBC_QRCoderECB(41, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 36, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(6, 121),
+ new CBC_QRCoderECB(14, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 47),
+ new CBC_QRCoderECB(34, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(46, 24),
+ new CBC_QRCoderECB(10, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(2, 15),
+ new CBC_QRCoderECB(64, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 37, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 122),
+ new CBC_QRCoderECB(4, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(29, 46),
+ new CBC_QRCoderECB(14, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(49, 24),
+ new CBC_QRCoderECB(10, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(24, 15),
+ new CBC_QRCoderECB(46, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 38, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 122),
+ new CBC_QRCoderECB(18, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(13, 46),
+ new CBC_QRCoderECB(32, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(48, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(42, 15),
+ new CBC_QRCoderECB(32, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 39, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(20, 117),
+ new CBC_QRCoderECB(4, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(40, 47),
+ new CBC_QRCoderECB(7, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(43, 24),
+ new CBC_QRCoderECB(22, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(10, 15),
+ new CBC_QRCoderECB(67, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 40, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 118),
+ new CBC_QRCoderECB(6, 119)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(18, 47),
+ new CBC_QRCoderECB(31, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(34, 24),
+ new CBC_QRCoderECB(34, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(20, 15),
+ new CBC_QRCoderECB(61, 16))));
}
if (versionNumber < 1 || versionNumber > 40) {
e = BCExceptionIllegalArgument;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index c045552155..0a265c9d04 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -56,7 +56,7 @@ CFX_PtrArray* CBC_QRDataBlock::GetDataBlocks( for (i = 0; i < ecBlockArray->GetSize(); i++) {
totalBlocks += ((CBC_QRCoderECB*)(*ecBlockArray)[i])->GetCount();
}
- CFX_PtrArray* datablock = FX_NEW CFX_PtrArray();
+ CFX_PtrArray* datablock = new CFX_PtrArray();
datablock->SetSize(totalBlocks);
CBC_AutoPtr<CFX_PtrArray> result(datablock);
int32_t numResultBlocks = 0;
@@ -66,10 +66,10 @@ CFX_PtrArray* CBC_QRDataBlock::GetDataBlocks( int32_t numDataCodewords = ecBlock->GetDataCodeWords();
int32_t numBlockCodewords =
ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
- CFX_ByteArray* bytearray = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* bytearray = new CFX_ByteArray();
bytearray->SetSize(numBlockCodewords);
(*result)[numResultBlocks++] =
- FX_NEW CBC_QRDataBlock(numDataCodewords, bytearray);
+ new CBC_QRDataBlock(numDataCodewords, bytearray);
}
}
int32_t shorterBlocksTotalCodewords =
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp index a42b67b29b..79b6db39a9 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -26,7 +26,7 @@ static int32_t N_DATA_MASKS = 0;
CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
void CBC_QRDataMask::Initialize() {
- DATA_MASKS = FX_NEW CFX_PtrArray();
+ DATA_MASKS = new CFX_PtrArray();
N_DATA_MASKS = BuildDataMasks();
}
void CBC_QRDataMask::Finalize() {
@@ -102,14 +102,14 @@ class DataMask111 : public CBC_QRDataMask { }
};
int32_t CBC_QRDataMask::BuildDataMasks() {
- DATA_MASKS->Add(FX_NEW DataMask000);
- DATA_MASKS->Add(FX_NEW DataMask001);
- DATA_MASKS->Add(FX_NEW DataMask010);
- DATA_MASKS->Add(FX_NEW DataMask011);
- DATA_MASKS->Add(FX_NEW DataMask100);
- DATA_MASKS->Add(FX_NEW DataMask101);
- DATA_MASKS->Add(FX_NEW DataMask110);
- DATA_MASKS->Add(FX_NEW DataMask111);
+ DATA_MASKS->Add(new DataMask000);
+ DATA_MASKS->Add(new DataMask001);
+ DATA_MASKS->Add(new DataMask010);
+ DATA_MASKS->Add(new DataMask011);
+ DATA_MASKS->Add(new DataMask100);
+ DATA_MASKS->Add(new DataMask101);
+ DATA_MASKS->Add(new DataMask110);
+ DATA_MASKS->Add(new DataMask111);
return DATA_MASKS->GetSize();
}
CBC_QRDataMask::CBC_QRDataMask() {}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 73f7c30208..643b15bdfd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -104,7 +104,7 @@ CBC_CommonDecoderResult* CBC_QRDecodedBitStreamParser::Decode( }
}
} while (!(mode == CBC_QRCoderMode::sTERMINATOR));
- CBC_CommonDecoderResult* tempCd = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
tempCd->Init(*bytes, result, byteSegments, ecLevel, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return tempCd;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 0a95ddc1be..70edfeff40 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -87,7 +87,7 @@ CBC_QRDetectorResult* CBC_QRDetector::ProcessFinderPatternInfo( SampleGrid(m_image, topLeft.get(), topRight.get(), bottomLeft.get(),
(CBC_ResultPoint*)(alignmentPattern), dimension, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CFX_PtrArray* points = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* points = new CFX_PtrArray;
if (alignmentPattern == NULL) {
points->Add(bottomLeft.release());
points->Add(topLeft.release());
@@ -98,7 +98,7 @@ CBC_QRDetectorResult* CBC_QRDetector::ProcessFinderPatternInfo( points->Add(topRight.release());
points->Add(alignmentPattern);
}
- return FX_NEW CBC_QRDetectorResult(bits, points);
+ return new CBC_QRDetectorResult(bits, points);
}
CBC_CommonBitMatrix* CBC_QRDetector::SampleGrid(
CBC_CommonBitMatrix* image,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index 80ec34f6cf..f9fdfbd2cf 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -37,7 +37,7 @@ CBC_QRFinderPattern::~CBC_QRFinderPattern() { }
CBC_QRFinderPattern* CBC_QRFinderPattern::Clone() {
CBC_QRFinderPattern* temp =
- FX_NEW CBC_QRFinderPattern(m_x, m_y, m_estimatedModuleSize);
+ new CBC_QRFinderPattern(m_x, m_y, m_estimatedModuleSize);
temp->m_count = m_count;
return temp;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 17579f4ec2..fc82584370 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -380,7 +380,7 @@ FX_BOOL CBC_QRFinderPatternFinder::HandlePossibleCenter( }
if (!found) {
m_possibleCenters.Add(
- FX_NEW CBC_QRFinderPattern(centerJ, centerI, estimatedModuleSize));
+ new CBC_QRFinderPattern(centerJ, centerI, estimatedModuleSize));
}
return TRUE;
}
@@ -463,7 +463,7 @@ CFX_PtrArray* CBC_QRFinderPatternFinder::SelectBestpatterns(int32_t& e) { if (m_possibleCenters.GetSize() > 3) {
BC_FX_PtrArray_Sort(m_possibleCenters, centerComparator);
}
- CFX_PtrArray* vec = FX_NEW CFX_PtrArray();
+ CFX_PtrArray* vec = new CFX_PtrArray();
vec->SetSize(3);
(*vec)[0] = ((CBC_QRFinderPattern*)m_possibleCenters[0])->Clone();
(*vec)[1] = ((CBC_QRFinderPattern*)m_possibleCenters[1])->Clone();
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index 50ffa104e8..1bc85f1a12 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -109,7 +109,7 @@ CBC_CommonBitMatrix* CBC_QRGridSampler::SampleGrid(CBC_CommonBitMatrix* image, CBC_CommonPerspectiveTransform::QuadrilateralToQuadrilateral(
p1ToX, p1ToY, p2ToX, p2ToY, p3ToX, p3ToY, p4ToX, p4ToY, p1FromX,
p1FromY, p2FromX, p2FromY, p3FromX, p3FromY, p4FromX, p4FromY));
- CBC_CommonBitMatrix* tempBitM = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* tempBitM = new CBC_CommonBitMatrix();
tempBitM->Init(dimensionX, dimensionY);
CBC_AutoPtr<CBC_CommonBitMatrix> bits(tempBitM);
CFX_FloatArray points;
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<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) {
diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index 8963b11d72..c5eac42e87 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -59,7 +59,7 @@ FX_ERR CFX_Graphics::Create(int32_t width, _type = FX_CONTEXT_Device;
_info._isAntialiasing = isAntialiasing;
{
- _aggGraphics = FX_NEW CAGG_Graphics;
+ _aggGraphics = new CAGG_Graphics;
return _aggGraphics->Create(this, width, height, format);
}
}
@@ -112,7 +112,7 @@ FX_ERR CFX_Graphics::SaveGraphState() { case FX_CONTEXT_Device: {
_FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
_renderDevice->SaveState();
- TInfo* info = FX_NEW TInfo;
+ TInfo* info = new TInfo;
info->_graphState.Copy(_info._graphState);
info->_isAntialiasing = _info._isAntialiasing;
info->_strokeAlignment = _info._strokeAlignment;
@@ -1152,7 +1152,7 @@ FX_ERR CAGG_Graphics::Create(CFX_Graphics* owner, if (_owner) {
return FX_ERR_Property_Invalid;
}
- CFX_FxgeDevice* device = FX_NEW CFX_FxgeDevice;
+ CFX_FxgeDevice* device = new CFX_FxgeDevice;
device->Create(width, height, format);
_owner = owner;
_owner->_renderDevice = device;
@@ -1172,7 +1172,7 @@ FX_ERR CFX_Path::Create() { if (_generator) {
return FX_ERR_Property_Invalid;
}
- _generator = FX_NEW CFX_PathGenerator;
+ _generator = new CFX_PathGenerator;
_generator->Create();
return FX_ERR_Succeeded;
}
diff --git a/xfa/src/fxgraphics/src/fx_path_generator.cpp b/xfa/src/fxgraphics/src/fx_path_generator.cpp index 3107febdbd..116a9df28e 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.cpp +++ b/xfa/src/fxgraphics/src/fx_path_generator.cpp @@ -10,7 +10,7 @@ CFX_PathGenerator::CFX_PathGenerator() { m_pPathData = NULL;
}
void CFX_PathGenerator::Create() {
- m_pPathData = FX_NEW CFX_PathData;
+ m_pPathData = new CFX_PathData;
}
CFX_PathGenerator::~CFX_PathGenerator() {
if (m_pPathData) {
diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index d186238238..5f6f99a0d4 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -247,7 +247,7 @@ CFXJSE_Class* CFXJSE_Class::Create(CFXJSE_Context* lpContext, return pClass;
}
v8::Isolate* pIsolate = lpContext->m_pIsolate;
- pClass = FX_NEW CFXJSE_Class(lpContext);
+ pClass = new CFXJSE_Class(lpContext);
ASSERT(pClass);
pClass->m_szClassName = lpClassDefinition->name;
CFXJSE_ScopeUtil_IsolateHandleRootContext scope(pIsolate);
diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index cc8f6cf342..eab41a93dd 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -146,7 +146,7 @@ CFXJSE_Context* CFXJSE_Context::Create(v8::Isolate* pIsolate, const FXJSE_CLASS* lpGlobalClass,
void* lpGlobalObject) {
CFXJSE_ScopeUtil_IsolateHandle scope(pIsolate);
- CFXJSE_Context* pContext = FX_NEW CFXJSE_Context(pIsolate);
+ CFXJSE_Context* pContext = new CFXJSE_Context(pIsolate);
CFXJSE_Class* lpGlobalClassObj = NULL;
v8::Local<v8::ObjectTemplate> hObjectTemplate;
if (lpGlobalClass) {
diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/src/runtime.cpp index bfdb089f57..a7ee67bc2a 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/src/runtime.cpp @@ -22,7 +22,7 @@ static void FXJSE_KillV8() { }
void FXJSE_Initialize() {
if (!CFXJSE_RuntimeData::g_RuntimeList) {
- CFXJSE_RuntimeData::g_RuntimeList = FX_NEW CFXJSE_RuntimeList;
+ CFXJSE_RuntimeData::g_RuntimeList = new CFXJSE_RuntimeList;
}
static FX_BOOL bV8Initialized = FALSE;
if (bV8Initialized) {
@@ -72,7 +72,7 @@ void FXJSE_Runtime_Release(FXJSE_HRUNTIME hRuntime) { }
}
CFXJSE_RuntimeData* CFXJSE_RuntimeData::Create(v8::Isolate* pIsolate) {
- CFXJSE_RuntimeData* pRuntimeData = FX_NEW CFXJSE_RuntimeData(pIsolate);
+ CFXJSE_RuntimeData* pRuntimeData = new CFXJSE_RuntimeData(pIsolate);
ASSERT(pRuntimeData);
CFXJSE_ScopeUtil_IsolateHandle scope(pIsolate);
v8::Local<v8::FunctionTemplate> hFuncTemplate =
diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index 8402a78fef..1ef7ceecb8 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -268,7 +268,7 @@ void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name, pIsolate->ThrowException(hError);
}
CFXJSE_Value* CFXJSE_Value::Create(v8::Isolate* pIsolate) {
- return FX_NEW CFXJSE_Value(pIsolate);
+ return new CFXJSE_Value(pIsolate);
}
void* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const {
ASSERT(!m_hValue.IsEmpty());
|