diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-04-24 18:21:50 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-05-02 17:48:01 +0200 |
| commit | f3c235aba752786c5114dae42587f38dbb1f335b (patch) | |
| tree | a722eaab3878b03126dccd187a7f0e9f8fa4724b /vcl/inc/win | |
| parent | 0dae5454104c568d73ce108a1003a382e2a2d418 (diff) | |
tdf#107205 vcl: don't always use D2DWriteTextOutRenderer
... because it cannot rotate text.
(regression from commit df556aa47da22f96b3fcd356c12419d3035cba3c)
Change-Id: If9bc6e98b8979c5eb02f1a5cfc12b4d19bdc481b
(cherry picked from commit 2eb91035c2f60e9dc476336474d51b23b666bb04)
Reviewed-on: https://gerrit.libreoffice.org/36904
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 8f51b4272450b6220f563740538f143c0bc70175)
Reviewed-on: https://gerrit.libreoffice.org/36990
Reviewed-by: V Stuart Foote <vstuart.foote@utsa.edu>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'vcl/inc/win')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index cf11a04ddace..61a5d91d9b88 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -121,7 +121,9 @@ public: std::map< UINT,sal_uInt16 > maVKMap; // map some dynamic VK_* entries // must be deleted before exit(), so delete it in DeInitSalData() - std::unique_ptr<TextOutRenderer> m_pTextOutRenderer; + std::unique_ptr<TextOutRenderer> m_pD2DWriteTextOutRenderer; + // tdf#107205 need 2 instances because D2DWrite can't rotate text + std::unique_ptr<TextOutRenderer> m_pExTextOutRenderer; }; inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } |