12 files changed, 21 insertions, 21 deletions
diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.cpp b/xfa/src/fdp/src/fde/fde_gdidevice.cpp
index 7f773efd96..03bbb23fc7 100644
--- a/xfa/src/fdp/src/fde/fde_gdidevice.cpp
+++ b/xfa/src/fdp/src/fde/fde_gdidevice.cpp
@@ -11,7 +11,7 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || _FX_OS_ == _FX_WIN64_
 IFDE_RenderDevice*	IFDE_RenderDevice::Create(CFX_DIBitmap *pBitmap, FX_BOOL bRgbByteOrder )
 {
-    return FDE_New CFDE_GdiDevice(pBitmap);
+    return new CFDE_GdiDevice(pBitmap);
 }
 IFDE_RenderDevice*	IFDE_RenderDevice::Create(CFX_RenderDevice *pDevice)
 {
diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.h b/xfa/src/fdp/src/fde/fde_gdidevice.h
index f7336c9b0a..25ae837481 100644
--- a/xfa/src/fdp/src/fde/fde_gdidevice.h
+++ b/xfa/src/fdp/src/fde/fde_gdidevice.h
@@ -17,7 +17,7 @@ public:
 
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
 
     virtual int32_t			GetWidth() const;
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp
index 9e475cdb67..c8e7c23fac 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.cpp
+++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp
@@ -35,14 +35,14 @@ IFDE_RenderDevice*	IFDE_RenderDevice::Create(CFX_DIBitmap *pBitmap, FX_BOOL bRgb
         return NULL;
     }
     pDevice->Attach(pBitmap, 0, bRgbByteOrder);
-    return FDE_New CFDE_FxgeDevice(pDevice, TRUE);
+    return new CFDE_FxgeDevice(pDevice, TRUE);
 }
 IFDE_RenderDevice* IFDE_RenderDevice::Create(CFX_RenderDevice *pDevice)
 {
     if (pDevice == NULL) {
         return NULL;
     }
-    return FDE_New CFDE_FxgeDevice(pDevice, FALSE);
+    return new CFDE_FxgeDevice(pDevice, FALSE);
 }
 CFDE_FxgeDevice::CFDE_FxgeDevice(CFX_RenderDevice *pDevice, FX_BOOL bOwnerDevice)
     : m_pDevice(pDevice)
diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h
index ab16cc7cae..39fa62667e 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.h
+++ b/xfa/src/fdp/src/fde/fde_gedevice.h
@@ -14,7 +14,7 @@ public:
     ~CFDE_FxgeDevice();
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
 
     virtual int32_t			GetWidth() const;
diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp
index 819563619e..e199a3ad5d 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.cpp
+++ b/xfa/src/fdp/src/fde/fde_geobject.cpp
@@ -10,7 +10,7 @@
 #ifndef _FDEPLUS
 IFDE_Path* IFDE_Path::Create()
 {
-    return FDE_New CFDE_Path;
+    return new CFDE_Path;
 }
 FX_BOOL CFDE_Path::StartFigure()
 {
diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h
index 3b1b22901d..fd9e29a4e5 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.h
+++ b/xfa/src/fdp/src/fde/fde_geobject.h
@@ -14,7 +14,7 @@ class CFDE_Path : public IFDE_Path, public CFX_Target
 public:
     virtual void			Release()
     {
-        FDE_Delete this;
+        delete this;
     }
 
     virtual FX_BOOL			StartFigure();
diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp
index 5f6e0aa7e8..e49fdafe95 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.cpp
+++ b/xfa/src/fdp/src/fde/fde_iterator.cpp
@@ -8,7 +8,7 @@
 #include "fde_iterator.h"
 IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create()
 {
-    return FDE_New CFDE_VisualSetIterator;
+    return new CFDE_VisualSetIterator;
 }
 CFDE_VisualSetIterator::CFDE_VisualSetIterator()
     : m_dwFilter(0)
diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h
index 6ebd5c566f..ec8f0abf62 100644
--- a/xfa/src/fdp/src/fde/fde_iterator.h
+++ b/xfa/src/fdp/src/fde/fde_iterator.h
@@ -18,7 +18,7 @@ public:
     ~CFDE_VisualSetIterator();
     virtual void			Release()
     {
-        FDE_Delete this;
+        delete this;
     }
 
     virtual FX_BOOL			AttachCanvas(IFDE_CanvasSet *pCanvas);
diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp
index 71a1b43991..447067db29 100644
--- a/xfa/src/fdp/src/fde/fde_object.cpp
+++ b/xfa/src/fdp/src/fde/fde_object.cpp
@@ -8,19 +8,19 @@
 #include "fde_object.h"
 IFDE_Pen* IFDE_Pen::Create()
 {
-    return FDE_New CFDE_Pen();
+    return new CFDE_Pen();
 }
 IFDE_Brush* IFDE_Brush::Create(int32_t iType)
 {
     switch (iType) {
         case FDE_BRUSHTYPE_Solid:
-            return FDE_New CFDE_SolidBrush;
+            return new CFDE_SolidBrush;
         case FDE_BRUSHTYPE_Hatch:
-            return FDE_New CFDE_HatchBrush;
+            return new CFDE_HatchBrush;
         case FDE_BRUSHTYPE_Texture:
-            return FDE_New CFDE_TextureBrush;
+            return new CFDE_TextureBrush;
         case FDE_BRUSHTYPE_LinearGradient:
-            return FDE_New CFDE_LinearBrush;
+            return new CFDE_LinearBrush;
         default:
             return NULL;
     }
diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h
index 190865f612..26100c7571 100644
--- a/xfa/src/fdp/src/fde/fde_object.h
+++ b/xfa/src/fdp/src/fde/fde_object.h
@@ -29,7 +29,7 @@ public:
     }
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
 
     virtual int32_t			GetType() const
@@ -144,7 +144,7 @@ public:
 
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
     virtual int32_t			GetType() const
     {
@@ -200,7 +200,7 @@ public:
 
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
     virtual int32_t			GetType() const
     {
@@ -274,7 +274,7 @@ public:
 
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
     virtual int32_t			GetType() const
     {
@@ -341,7 +341,7 @@ public:
 
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
     virtual int32_t			GetType() const
     {
diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp
index 7feca48ab8..ff8dceea3f 100644
--- a/xfa/src/fdp/src/fde/fde_render.cpp
+++ b/xfa/src/fdp/src/fde/fde_render.cpp
@@ -45,7 +45,7 @@ void FDE_GetPageMatrix(CFX_Matrix &pageMatrix, const CFX_RectF &docPageRect, con
 }
 IFDE_RenderContext* IFDE_RenderContext::Create()
 {
-    return FDE_New CFDE_RenderContext;
+    return new CFDE_RenderContext;
 }
 CFDE_RenderContext::CFDE_RenderContext()
     : CFX_ThreadLock()
diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h
index 6bec3e070f..52c95c50a8 100644
--- a/xfa/src/fdp/src/fde/fde_render.h
+++ b/xfa/src/fdp/src/fde/fde_render.h
@@ -14,7 +14,7 @@ public:
     virtual ~CFDE_RenderContext();
     virtual void				Release()
     {
-        FDE_Delete this;
+        delete this;
     }
     virtual FX_BOOL				StartRender(IFDE_RenderDevice *pRenderDevice,
                                             IFDE_CanvasSet *pCanvasSet,