commit 8f51b4272450b6220f563740538f143c0bc70175
author Michael Stahl <mstahl@redhat.com> Mon Apr 24 18:21:50 2017 +0200
committer Andras Timar <andras.timar@collabora.com> Wed Apr 26 15:08:44 2017 +0200
tree 98b2db26b0b440634b36a9672ad52334dcc954f0
parent 3b40661889be16f2034c02d17564f63bda4dabb6

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>

vcl/inc/win/saldata.hxx

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index cf11a04..61a5d91 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; }

vcl/win/gdi/winlayout.cxx

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 22a6fb2..782f56c 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3080,18 +3080,24 @@ TextOutRenderer & TextOutRenderer::get(bool bUseDWrite)
        abort();
    }

    if (!pSalData->m_pTextOutRenderer)
    if (bUseDWrite)
    {
        if (bUseDWrite && D2DWriteTextOutRenderer::InitModules())
        static bool const bSuccess(D2DWriteTextOutRenderer::InitModules());
        if (bSuccess && !pSalData->m_pD2DWriteTextOutRenderer)
        {
            pSalData->m_pTextOutRenderer.reset(new D2DWriteTextOutRenderer());
            pSalData->m_pD2DWriteTextOutRenderer.reset(new D2DWriteTextOutRenderer());
        }
        else
        if (pSalData->m_pD2DWriteTextOutRenderer)
        {
            pSalData->m_pTextOutRenderer.reset(new ExTextOutRenderer());
            return *pSalData->m_pD2DWriteTextOutRenderer;
        }
        // else: fall back to GDI
    }
    return *pSalData->m_pTextOutRenderer;
    if (!pSalData->m_pExTextOutRenderer)
    {
        pSalData->m_pExTextOutRenderer.reset(new ExTextOutRenderer);
    }
    return *pSalData->m_pExTextOutRenderer;
}