summaryrefslogtreecommitdiff
path: root/xfa/src/fgas/src
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fgas/src')
-rw-r--r--xfa/src/fgas/src/crt/fx_stream.cpp44
-rw-r--r--xfa/src/fgas/src/crt/fx_utils.cpp4
-rw-r--r--xfa/src/fgas/src/font/fx_gdifont.cpp10
-rw-r--r--xfa/src/fgas/src/font/fx_gefont.cpp26
-rw-r--r--xfa/src/fgas/src/font/fx_stdfontmgr.cpp20
-rw-r--r--xfa/src/fgas/src/layout/fx_rtfbreak.cpp2
-rw-r--r--xfa/src/fgas/src/layout/fx_textbreak.cpp10
-rw-r--r--xfa/src/fgas/src/layout/fx_textbreak.h2
-rw-r--r--xfa/src/fgas/src/localization/fx_locale.cpp4
-rw-r--r--xfa/src/fgas/src/localization/fx_localemgr.cpp2
-rw-r--r--xfa/src/fgas/src/xml/fx_sax_imp.cpp8
11 files changed, 66 insertions, 66 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 16:33:55 +0000