summaryrefslogtreecommitdiff
path: root/vcl/headless
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-11-24 01:32:11 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2016-11-26 10:58:38 +0000
commit59859a8aaa75384159e315ee2577d5cc7e2aa6e8 (patch)
treed40bdc98a7bc5574c662d93dd7d54d4d9231617c /vcl/headless
parent8c173ce9ba4d90770cd85b148fe3122a097396a7 (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>
Diffstat (limited to 'vcl/headless')
-rw-r--r--vcl/headless/svptext.cxx9
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 )