From 17f382a50a7c4e5b6f14f76027a15de4ac17bc4c Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 12 Apr 2016 16:55:56 -0700 Subject: Cleanup various IFX_ text interfaces. This CL removes IFX_ArabicChar, IFX_RTFBreak, IFX_TxtBreak, IFX_WordBreak, IFX_FormatString, and IFX_GSUBTable. References were updated to be the concrete classes. The CFX_GSUBTable was also removed as it is unused. BUG=pdfium:468 Review URL: https://codereview.chromium.org/1882213002 --- xfa/fde/tto/fde_textout.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fde/tto/fde_textout.cpp') diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp index 265db253fc..d846abc886 100644 --- a/xfa/fde/tto/fde_textout.cpp +++ b/xfa/fde/tto/fde_textout.cpp @@ -145,7 +145,7 @@ class CFDE_TextOut : public IFDE_TextOut, public CFX_Target { void ToTextRun(const FDE_LPTTOPIECE pPiece, FX_TXTRUN& tr); void DrawLine(const FDE_LPTTOPIECE pPiece, CFDE_Pen*& pPen); - IFX_TxtBreak* m_pTxtBreak; + CFX_TxtBreak* m_pTxtBreak; IFX_Font* m_pFont; FX_FLOAT m_fFontSize; FX_FLOAT m_fLineSpace; @@ -209,8 +209,7 @@ CFDE_TextOut::CFDE_TextOut() m_pCharPos(NULL), m_iCharPosSize(0), m_pRenderDevice(NULL) { - m_pTxtBreak = IFX_TxtBreak::Create(FX_TXTBREAKPOLICY_None); - FXSYS_assert(m_pTxtBreak != NULL); + m_pTxtBreak = new CFX_TxtBreak(FX_TXTBREAKPOLICY_None); m_Matrix.SetIdentity(); m_rtClip.Reset(); m_rtLogicClip.Reset(); -- cgit v1.2.3