Merge to XFA: Kill CFX_Object.

xfa/src/fgas/src/localization/fx_localeimp.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 _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);
     virtual void Release()
     {
         delete this;
     }
 
     virtual CFX_WideString GetName();
     virtual void GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, CFX_WideString& wsNumSymbol) const;
 
     virtual void GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const;
     virtual void GetMonthName(FX_INT32 nMonth, CFX_WideString& wsMonthName, FX_BOOL bAbbr = TRUE) const;
     virtual void GetDayName(FX_INT32 nWeek, CFX_WideString& wsDayName, FX_BOOL bAbbr = TRUE) const;
     virtual void GetMeridiemName(CFX_WideString& wsMeridiemName, FX_BOOL bAM = TRUE) const;
     virtual void GetTimeZone(FX_TIMEZONE& tz) const;
     virtual void GetEraName(CFX_WideString& wsEraName, FX_BOOL bAD = TRUE) const;
 
     virtual void GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType, CFX_WideString& wsPattern) const;
     virtual void GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType, CFX_WideString& wsPattern) const;
     virtual void GetNumPattern(FX_LOCALENUMSUBCATEGORY eType, CFX_WideString& wsPattern) const;
 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);
     virtual void Release()
     {
         delete this;
     }
 
     virtual void SplitFormatString(const CFX_WideString& wsFormatString, CFX_WideStringArray& wsPatterns);
     virtual FX_LOCALECATEGORY GetCategory(const CFX_WideString& wsPattern);
@@ skipping 18 matching lines @@
     IFX_Locale* GetTextFormat(const CFX_WideString &wsPattern, FX_WSTR wsCategory, CFX_WideString& wsPurgePattern);
     IFX_Locale* GetNumericFormat(const CFX_WideString& wsPattern, FX_INT32& iDotIndex, FX_DWORD& dwStyle, CFX_WideString& wsPurgePattern);
     FX_BOOL     FormatStrNum(FX_WSTR wsInputNum, const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
     FX_BOOL             FormatLCNumeric(CFX_LCNumeric& lcNum, const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
     FX_DATETIMETYPE GetDateTimeFormat(const CFX_WideString& wsPattern, IFX_Locale*& pLocale, CFX_WideString &wsDatePattern, CFX_WideString &wsTimePattern);
     IFX_Locale*         GetPatternLocale(FX_WSTR wsLocale);
     IFX_LocaleMgr*      m_pLocaleMgr;
     FX_BOOL                     m_bUseLCID;
 };
 #endif