summaryrefslogtreecommitdiff
path: root/vcl/inc/win/winlayout.hxx
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-10-28 04:19:46 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2016-10-28 19:22:54 +0000
commit3d456dfa6637c6c3ebe7a21f1f1a5b05039cee2a (patch)
treef52b61dfc71d34baef2166ebf4bc8699a1e89abb /vcl/inc/win/winlayout.hxx
parentc0baab9aa80bfa49b753d2d598a4fbc71ceb656e (diff)
tdf#98879: Fix vertical text on Windows for the new layout
The DirectWrite rendering code wasn’t handling vertical text correctly at least when used with CommonSalLayout. It has been fixed and now made the default. We are also doing all vertical text handling on our own, so loading special vertical fonts on Windows is now disabled. Change-Id: I10d150367fe59c77459bb1b813b6f31a0ff0c5d0 Reviewed-on: https://gerrit.libreoffice.org/30346 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Tested-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc/win/winlayout.hxx')
-rwxr-xr-xvcl/inc/win/winlayout.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 1f0425133e83..b137a4bc20f9 100755
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -455,11 +455,15 @@ class D2DWriteTextOutRenderer : public TextOutRenderer
typedef HRESULT(WINAPI *pD2D1CreateFactory_t)(D2D1_FACTORY_TYPE,
REFIID, const D2D1_FACTORY_OPTIONS *, void **);
+ typedef HRESULT(WINAPI *pD2D1MakeRotateMatrix_t)(float, D2D1_POINT_2F,
+ D2D1_MATRIX_3X2_F*);
+
typedef HRESULT(WINAPI *pDWriteCreateFactory_t)(DWRITE_FACTORY_TYPE,
REFIID, IUnknown **);
static HINSTANCE mmD2d1, mmDWrite;
static pD2D1CreateFactory_t D2D1CreateFactory;
+ static pD2D1MakeRotateMatrix_t D2D1MakeRotateMatrix;
static pDWriteCreateFactory_t DWriteCreateFactory;
public: