Merge to XFA: Kill CFX_Object.

xfa/src/fxbarcode/BC_DecoderResult.h

Index: xfa/src/fxbarcode/BC_DecoderResult.h
diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h
index ff98b2c40785fc81099fffc2c317ff6e56162d13..9655d663838e89df5c4f30693ae82cfcee260219 100644
--- a/xfa/src/fxbarcode/BC_DecoderResult.h
+++ b/xfa/src/fxbarcode/BC_DecoderResult.h
@@ -7,7 +7,7 @@
 #ifndef _BC_DECODERRESULT_H_
 #define _BC_DECODERRESULT_H_
 class CBC_DecoderResult;
-class CBC_DecoderResult : public CFX_Object
+class CBC_DecoderResult
 {
 public:
     CBC_DecoderResult(CFX_ByteArray* rawBytes, CFX_ByteString text,  CFX_ByteString ecLevel);
@@ -19,14 +19,14 @@ public:
     void setErrorsCorrected(FX_INT32 errorsCorrected);
     FX_INT32 getErasures();
     void setErasures(FX_INT32 erasures);
-    CFX_Object* getOther();
-    void setOther(CFX_Object* other);
+    void* getOther();
+    void setOther(void* other);
 private:
     CFX_ByteArray* m_rawBytes;
     CFX_ByteString m_text;
     CFX_ByteString m_ecLevel;
     FX_INT32 m_errorsCorrected;
     FX_INT32 m_erasures;
-    CFX_Object* m_other;
+    void* m_other;
 };
 #endif