Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/common/xfa_localemgr.h

Index: xfa/src/fxfa/src/common/xfa_localemgr.h
diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h
index f425a903fc37418e949cb6dc8e228b7bf70fabcb..ff3ab3927f42e158e602eb2d304c739c4effc2b5 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/src/common/xfa_localemgr.h
@@ -25,7 +25,7 @@ class CXFA_LocaleMgr;
 #define XFA_LANGID_pt_BR	0x0416
 #define XFA_LANGID_nl_NL	0x0413
 #define XFA_LANGID_ru_RU	0x0419
-class CXFA_LocaleMgr : public IFX_LocaleMgr, public CFX_Object
+class CXFA_LocaleMgr : public IFX_LocaleMgr
 {
 public:
     CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid);
@@ -56,7 +56,7 @@ public:
 
     virtual void		GetTimeZone(FX_TIMEZONE& tz) = 0;
 };
-class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider, public CFX_Object
+class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider
 {
 public:
     CXFA_TimeZoneProvider();