Merge to XFA: Kill CFX_Object.

xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h

Index: xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
index 91895a54d72dd2997942ad51016d1dd98ff45962..d897fc5867d13f4a4a31dadb1d8b8ec4e1808bd4 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
@@ -24,7 +24,7 @@ enum FX_WordBreakProp {
     FX_WordBreakProp_ExtendNumLet	,
 };
 FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint);
-class CFX_CharIter : public IFX_CharIter, public CFX_Object
+class CFX_CharIter : public IFX_CharIter
 {
 public:
     CFX_CharIter(const CFX_WideString & wsText);
@@ -41,7 +41,7 @@ private:
     const CFX_WideString &m_wsText;
     FX_INT32	m_nIndex;
 };
-class CFX_WordBreak : public IFX_WordBreak, public CFX_Object
+class CFX_WordBreak : public IFX_WordBreak
 {
 public:
     CFX_WordBreak();