Merge to XFA: Kill CFX_Object.

xfa/src/fgas/src/localization/fx_localeimp.h

Index: xfa/src/fgas/src/localization/fx_localeimp.h
diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h
index 7698388020d6747d02070e5060230dc4e5233dd9..c7d534d106de64ee151a79484380bffb8d7981ff 100644
--- a/xfa/src/fgas/src/localization/fx_localeimp.h
+++ b/xfa/src/fgas/src/localization/fx_localeimp.h
@@ -7,7 +7,7 @@
 #ifndef _FX_LOCALE_IMP_H_
 #define _FX_LOCALE_IMP_H_
 class CFX_LCNumeric;
-class CFX_Locale : public IFX_Locale, public CFX_Object
+class CFX_Locale : public IFX_Locale
 {
 public:
     CFX_Locale(CXML_Element* pLocaleData);
@@ -33,7 +33,7 @@ protected:
     virtual ~CFX_Locale();
     CXML_Element* m_pElement;
 };
-class CFX_FormatString : public IFX_FormatString, public CFX_Object
+class CFX_FormatString : public IFX_FormatString
 {
 public:
     CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID);