diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-10 12:48:13 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-11 00:16:39 +0200 |
commit | a909afbc21e8cdd03a7f27db798f830c76aa91d2 (patch) | |
tree | 540641dd83ebf9f51556306022026600e567fb1c /vcl/headless | |
parent | move Java from config_features to already existing config_java (diff) | |
download | core-a909afbc21e8cdd03a7f27db798f830c76aa91d2.tar.gz core-a909afbc21e8cdd03a7f27db798f830c76aa91d2.zip |
Fold CommonSalLayout into GenericSalLayout
Now the crazy constructors of CommonSalLayout are gone, we can merge
the two and drop one level of indirection.
Change-Id: I166e4ed2c9d22c1ce75246d486f7526c4928f652
Reviewed-on: https://gerrit.libreoffice.org/54077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/headless')
-rw-r--r-- | vcl/headless/svptext.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index caa34e33f7b9..1e0b578f800b 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -23,7 +23,7 @@ #include <headless/svpgdi.hxx> #include <config_cairo_canvas.h> #include <impfontmetricdata.hxx> -#include <CommonSalLayout.hxx> +#include <sallayout.hxx> void SvpSalGraphics::SetFont( const FontSelectPattern* pIFSD, int nFallbackLevel ) { @@ -106,7 +106,7 @@ std::unique_ptr<SalLayout> SvpSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, return m_aTextRenderImpl.GetTextLayout(rArgs, nFallbackLevel); } -void SvpSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) +void SvpSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) { m_aTextRenderImpl.DrawTextLayout(rLayout); } |