diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-10 10:17:13 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-10 22:05:28 +0000 |
| commit | f3d8573dc0191437be7339e9d5098bfd3e55aafb (patch) | |
| tree | 322c860ce30cd5f2a1cb78d13ddb31c3cdb45381 /xfa/fde/cfde_textout.h | |
| parent | 0f6ceba6bf6a966c1946aec2ff985dc2728fd71b (diff) | |
| download | pdfium-f3d8573dc0191437be7339e9d5098bfd3e55aafb.tar.xz | |
Remove unused FDE_TTOSTYLE_ flags
This CL removes the unused FDE_TTOSTYLE_ flags and their supporting
code.
Change-Id: Ib5ff1af77ceab5a526a845c1fc316a3742ab810a
Reviewed-on: https://pdfium-review.googlesource.com/10455
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_textout.h')
| -rw-r--r-- | xfa/fde/cfde_textout.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h index 98a7d11cd4..7424573b6b 100644 --- a/xfa/fde/cfde_textout.h +++ b/xfa/fde/cfde_textout.h @@ -17,13 +17,10 @@ #include "core/fxge/fx_dib.h" #include "xfa/fgas/font/cfgas_fontmgr.h" -#define FDE_TTOSTYLE_Underline 0x0001 -#define FDE_TTOSTYLE_Strikeout 0x0002 #define FDE_TTOSTYLE_SingleLine 0x0010 -#define FDE_TTOSTYLE_HotKey 0x0040 -#define FDE_TTOSTYLE_Ellipsis 0x0080 #define FDE_TTOSTYLE_LineWrap 0x0100 #define FDE_TTOSTYLE_LastLineHeight 0x1000 + #define FDE_TTOALIGNMENT_TopLeft 0 #define FDE_TTOALIGNMENT_TopCenter 1 #define FDE_TTOALIGNMENT_TopRight 2 @@ -82,7 +79,6 @@ class CFDE_TextOut { void SetTextColor(FX_ARGB color); void SetStyles(uint32_t dwStyles); void SetTabWidth(float fTabWidth); - void SetEllipsisString(const CFX_WideString& wsEllipsis); void SetParagraphBreakChar(wchar_t wch); void SetAlignment(int32_t iAlignment); void SetLineSpace(float fLineSpace); @@ -119,9 +115,6 @@ class CFDE_TextOut { const CFX_RectF& rect, const CFX_RectF& rtClip); void LoadText(const wchar_t* pwsStr, int32_t iLength, const CFX_RectF& rect); - void LoadEllipsis(); - void ExpandBuffer(int32_t iSize, int32_t iType); - void RetrieveEllPieces(std::vector<int32_t>* pCharWidths); void Reload(const CFX_RectF& rect); void ReloadLinePiece(CFDE_TTOLine* pLine, const CFX_RectF& rect); @@ -131,14 +124,12 @@ class CFDE_TextOut { bool bReload, const CFX_RectF& rect); void AppendPiece(const FDE_TTOPIECE& ttoPiece, bool bNeedReload, bool bEnd); - void ReplaceWidthEllipsis(); void DoAlignment(const CFX_RectF& rect); void OnDraw(const CFX_RectF& rtClip); int32_t GetDisplayPos(FDE_TTOPIECE* pPiece); int32_t GetCharRects(const FDE_TTOPIECE* pPiece); FX_TXTRUN ToTextRun(const FDE_TTOPIECE* pPiece); - void DrawLine(const FDE_TTOPIECE* pPiece, FX_ARGB color); std::unique_ptr<CFX_TxtBreak> m_pTxtBreak; CFX_RetainPtr<CFGAS_GEFont> m_pFont; @@ -149,14 +140,10 @@ class CFDE_TextOut { int32_t m_iAlignment; int32_t m_iTxtBkAlignment; std::vector<int32_t> m_CharWidths; - std::vector<int32_t> m_EllCharWidths; wchar_t m_wParagraphBkChar; FX_ARGB m_TxtColor; uint32_t m_dwStyles; uint32_t m_dwTxtBkStyles; - CFX_WideString m_wsEllipsis; - bool m_bElliChanged; - int32_t m_iEllipsisWidth; CFX_WideString m_wsText; CFX_RectF m_rtClip; CFX_RectF m_rtLogicClip; @@ -169,7 +156,6 @@ class CFDE_TextOut { // NOTE: m_pDefaultRenderDevice must outlive m_pRenderDevice. std::unique_ptr<CFX_DefaultRenderDevice> m_pDefaultRenderDevice; std::unique_ptr<CFDE_RenderDevice> m_pRenderDevice; - std::vector<int32_t> m_HotKeys; std::vector<CFX_RectF> m_rectArray; }; |