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 .

10 files changed, 116 insertions, 116 deletions

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];

   }