Merge to XFA: Kill CFX_Object.

xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h

Index: xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 41d2f23db6256848a2961935d2bf4b0263028f9c..9661834bd8d6ab178a66cb51b0610bd5d2db0694 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
@@ -6,10 +6,9 @@
 
 #ifndef _BC_DATAMATRIXVERSION_H_
 #define _BC_DATAMATRIXVERSION_H_
-class ECB;
 class ECBlocks;
 class CBC_DataMatrixVersion;
-class ECB : public CFX_Object
+class ECB
 {
 public:
     ECB(FX_INT32 count, FX_INT32 dataCodewords)
@@ -31,7 +30,7 @@ private:
     FX_INT32 m_count;
     FX_INT32 m_dataCodewords;
 };
-class ECBlocks : public CFX_Object
+class ECBlocks
 {
 public:
     ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks)
@@ -67,7 +66,7 @@ private:
     FX_INT32 m_ecCodewords;
     CFX_PtrArray m_ecBlocks;
 };
-class CBC_DataMatrixVersion  : public CFX_Object
+class CBC_DataMatrixVersion
 {
 public:
     CBC_DataMatrixVersion(FX_INT32 versionNumber,