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

[Libreoffice Gerrit user]

 vcl/win/gdi/salfont.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3a6f510c3e3bc269b2816cd6cca57f81eb7c4ae3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 21 15:29:04 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 21 21:27:43 2018 +0200

    use ImplDoSetFont instead of SetFont
    
    i.e. the same pattern as CreateFontSubset and GetGlyphWidths
    
    Change-Id: Ie90d7279c4debe47b4d2739e12cdae86f4e70517
    Reviewed-on: https://gerrit.libreoffice.org/59403
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 7ea455715136..c471c0c3be1f 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1777,7 +1777,10 @@ const void* WinSalGraphics::GetEmbedFontData(const PhysicalFontFace* pFont, long
     FontSelectPattern aIFSD( *pFont, Size(0,1000), 1000.0, 0, false );
 
     ScopedFont aOldFont(*this);
-    SetFont( &aIFSD, 0 );
+
+    float fScale = 0.0;
+    HFONT hOldFont = nullptr;
+    ImplDoSetFont(&aIFSD, pFont, fScale, hOldFont);
 
     // get the raw font file data
     RawFontData aRawFontData( getHDC() );