Merge to XFA: Kill CFX_Object.

xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #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)
     {
         m_count = count;
         m_dataCodewords = dataCodewords;
     }
 
     FX_INT32 GetCount()
     {
         return m_count;
     }
 
     FX_INT32 GetDataCodewords()
     {
         return m_dataCodewords;
     }
 private:
     FX_INT32 m_count;
     FX_INT32 m_dataCodewords;
 };
-class ECBlocks : public CFX_Object
+class ECBlocks
 {
 public:
     ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks)
     {
         m_ecCodewords = ecCodewords;
         m_ecBlocks.Add(ecBlocks);
     }
 
     ECBlocks(FX_INT32 ecCodewords, ECB *ecBlocks1, ECB *ecBlocks2)
     {
@@ skipping 15 matching lines @@
     }
 
     const CFX_PtrArray &GetECBlocks()
     {
         return m_ecBlocks;
     }
 private:
     FX_INT32 m_ecCodewords;
     CFX_PtrArray m_ecBlocks;
 };
-class CBC_DataMatrixVersion  : public CFX_Object
+class CBC_DataMatrixVersion
 {
 public:
     CBC_DataMatrixVersion(FX_INT32 versionNumber,
                           FX_INT32 symbolSizeRows,
                           FX_INT32 symbolSizeColumns,
                           FX_INT32 dataRegionSizeRows,
                           FX_INT32 dataRegionSizeColumns,
                           ECBlocks *ecBlocks);
     virtual ~CBC_DataMatrixVersion();
     static void Initialize();
@@ skipping 11 matching lines @@
     FX_INT32 m_versionNumber;
     FX_INT32 m_symbolSizeRows;
     FX_INT32 m_symbolSizeColumns;
     FX_INT32 m_dataRegionSizeRows;
     FX_INT32 m_dataRegionSizeColumns;
     ECBlocks *m_ecBlocks;
     FX_INT32 m_totalCodewords;
     static CFX_PtrArray* VERSIONS;
 };
 #endif