[Libreoffice-commits] core.git: vcl/win

[Khaled Hosny]

 vcl/win/gdi/winlayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fbfe5cbc288ead6bba9d30ddb849dcb41a0d5e0
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Dec 16 08:54:45 2016 +0200

    Fix typo from 6c436ba09cb35235ce6f4065cf74c9a6ff14a4bd
    
    This broke OpenGL glyph caching since we were using a different DC
    than the one we selected the font on.
    
    Change-Id: I43218891aa1bc75599700ce6e0b582a5e73ff210

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 1f31cfa..57ac16f 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -57,7 +57,7 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, S
         SAL_WARN("vcl.gdi", "CreateCompatibleDC failed: " << WindowsErrorString(GetLastError()));
         return false;
     }
-    HFONT hOrigFont = static_cast<HFONT>(SelectObject(hDC, hFont));
+    HFONT hOrigFont = static_cast<HFONT>(SelectObject(hNewDC, hFont));
     if (hOrigFont == nullptr)
     {
         SAL_WARN("vcl.gdi", "SelectObject failed: " << WindowsErrorString(GetLastError()));