diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-24 01:32:11 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-06 20:41:31 -0500 |
| commit | 5609268b8104d207e89994a65ed8640bf52b1315 (patch) | |
| tree | 0338e2243ecf795b32fdd5fbddb369c914d68eac /vcl/headless/svptext.cxx | |
| parent | c8faf047b50d0661e943f522b1a9777c1e81347d (diff) | |
ServerFontLayout is already gone
Kill DrawServerFontLayout, and rename DrawSalLayout to DrawTextLayout,
in parity with GetTextLayout.
Change-Id: I3f61efd8c6ecde64f28301dca6a7c91eb0873702
Reviewed-on: https://gerrit.libreoffice.org/31224
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 59859a8aaa75384159e315ee2577d5cc7e2aa6e8)
Diffstat (limited to 'vcl/headless/svptext.cxx')
| -rw-r--r-- | vcl/headless/svptext.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 011a51c3f210..65c7d05cdbb6 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -117,14 +117,9 @@ SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return m_aTextRenderImpl.GetTextLayout(rArgs, nFallbackLevel); } -void SvpSalGraphics::DrawServerFontLayout( const GenericSalLayout& rSalLayout, const FreetypeFont& rFreetypeFont ) +void SvpSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) { - m_aTextRenderImpl.DrawServerFontLayout( rSalLayout, rFreetypeFont ); -} - -void SvpSalGraphics::DrawSalLayout( const CommonSalLayout& rSalLayout ) -{ - DrawServerFontLayout( rSalLayout, rSalLayout.getFontData() ); + m_aTextRenderImpl.DrawTextLayout(rLayout); } void SvpSalGraphics::SetTextColor( SalColor nSalColor ) |