diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-12 16:55:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-12 16:55:56 -0700 |
| commit | 17f382a50a7c4e5b6f14f76027a15de4ac17bc4c (patch) | |
| tree | 337f45c03f9a6f40d30dc0820f29575fd55034b0 /xfa/fxfa/app | |
| parent | f1accf62715942e3f833fa57d0e6e1b70f51bae6 (diff) | |
| download | pdfium-17f382a50a7c4e5b6f14f76027a15de4ac17bc4c.tar.xz | |
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
Diffstat (limited to 'xfa/fxfa/app')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index 4a20cbb44d..1ee0dbe6f3 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -736,12 +736,12 @@ CFDE_XMLNode* CXFA_TextLayout::GetXMLContainerNode() { } return pXMLContainer; } -IFX_RTFBreak* CXFA_TextLayout::CreateBreak(FX_BOOL bDefault) { +CFX_RTFBreak* CXFA_TextLayout::CreateBreak(FX_BOOL bDefault) { uint32_t dwStyle = FX_RTFLAYOUTSTYLE_ExpandTab; if (!bDefault) { dwStyle |= FX_RTFLAYOUTSTYLE_Pagination; } - IFX_RTFBreak* pBreak = IFX_RTFBreak::Create(0); + CFX_RTFBreak* pBreak = new CFX_RTFBreak(0); pBreak->SetLayoutStyles(dwStyle); pBreak->SetLineBreakChar(L'\n'); pBreak->SetLineBreakTolerance(1); diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index a96c537033..c80e4f6cca 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -341,7 +341,7 @@ class CXFA_TextLayout { private: void GetTextDataNode(); CFDE_XMLNode* GetXMLContainerNode(); - IFX_RTFBreak* CreateBreak(FX_BOOL bDefault); + CFX_RTFBreak* CreateBreak(FX_BOOL bDefault); void InitBreak(FX_FLOAT fLineWidth); void InitBreak(IFDE_CSSComputedStyle* pStyle, FDE_CSSDISPLAY eDisplay, @@ -400,7 +400,7 @@ class CXFA_TextLayout { CXFA_Node* m_pTextDataNode; FX_BOOL m_bRichText; IFX_MEMAllocator* m_pAllocator; - IFX_RTFBreak* m_pBreak; + CFX_RTFBreak* m_pBreak; CXFA_LoaderContext* m_pLoader; int32_t m_iLines; FX_FLOAT m_fMaxWidth; |