From d436065bc1c68fc2d90e73253d8c00503c72dfd0 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 15 Nov 2016 13:48:45 +0200 Subject: tdf#103725: Default to GDI even with the new layout engine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that our DirectWrite integration is missing few key features, so back to GDI so at least people who need these feature can have away to make them work. So the situation is now with the new layout engine is like the old one; GDI when OpenGL is not use and DirectWrite when OpenGL is used. Fixing DirectWrite is now someone else’s problem. Should also fix tdf#100986. Change-Id: I102cac8a324f77b050d5183911b5cfda0b6b8f2b Reviewed-on: https://gerrit.libreoffice.org/30868 Reviewed-by: Mike Kaganski Tested-by: Jenkins --- vcl/inc/win/salgdi.h | 2 +- vcl/inc/win/winlayout.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 8f75c1b04a40..305005540841 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -357,7 +357,7 @@ private: // get kernign pairs of the current font sal_uLong GetKernPairs(); - static void DrawTextLayout(const CommonSalLayout&, HDC); + static void DrawTextLayout(const CommonSalLayout&, HDC, bool bUseDWrite); public: // public SalGraphics methods, the interface to the independent vcl part diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index 64e78d4affc7..0e30e071050b 100755 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -421,7 +421,7 @@ protected: TextOutRenderer & operator = (const TextOutRenderer &) = delete; public: - static TextOutRenderer & get(); + static TextOutRenderer & get(bool bUseDWrite); virtual ~TextOutRenderer() = default; -- cgit