Rebased ref, commits from common ancestor:
commit 8cc62fde256dc4a2223b2100431881c5c097a9e6
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Mar 26 15:08:12 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Mar 27 14:55:27 2019 +0100
Fix windows build
After 54ac2b203a6dd974c0153996ba67b26d585e98e1
Change-Id: I805415dfa75568d843fceb5a79b637aac337ffd4
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index b0158f9154d5..dc37346f7630 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -932,6 +932,7 @@ void WinSalGraphics::SetFont( const FontSelectPattern*
pFont, int nFallbackLevel
// WinSalGraphics::GetEmbedFontData does not set mpFontInstance
// since it is interested in font file data only.
mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<WinFontInstance*>(
pFont->mpFontInstance.get() );
+ WinFontInstance *pFontInstance =
static_cast<WinFontInstance*>(pFont->mpFontInstance.get());
HFONT hOldFont = nullptr;
HFONT hNewFont = pFontInstance ? pFontInstance->GetHFONT() : nullptr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
