Merge to XFA: Kill CFX_Object.

fpdfsdk/include/fsdk_define.h

Index: fpdfsdk/include/fsdk_define.h
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 3509e8e2ab394f2ee1fc16c961407f68e5163955..4c59a28f9445b6ae4ca671218df30db8e9e0135b 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -75,7 +75,7 @@ typedef unsigned int FX_UINT;
 
 #include "fpdfview.h"
 
-class CPDF_CustomAccess FX_FINAL : public IFX_FileRead, public CFX_Object
+class CPDF_CustomAccess FX_FINAL : public IFX_FileRead
 {
 public:
 	CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
@@ -95,7 +95,7 @@ public:
 	FX_DWORD			m_BufferOffset;
 };
 
-class CFPDF_FileStream : public IFX_FileStream, public CFX_Object
+class CFPDF_FileStream : public IFX_FileStream
 {
 public:
 	CFPDF_FileStream(FPDF_FILEHANDLER* pFS);