Partially revert "Fixup 23c51251"

This reverts most of commit e8d48dd7.

Hopefully it will make the Win@42 tinderbox happy again.

Change-Id: Ie5ef2c16a62e774dcd1f6005df3d86e1973dea2d
Reviewed-on: https://gerrit.libreoffice.org/54567Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

vcl/win/gdi/winlayout.cxx

@@ -342,7 +342,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU
 hb_font_t* WinFontInstance::ImplInitHbFont()
 {
     assert(m_hDC);
-    assert(m_hFont);
+    m_hFont = static_cast<HFONT>(GetCurrentObject(m_hDC, OBJ_FONT));
     hb_font_t* pHbFont = InitHbFont(hb_face_create_for_tables(getFontTable, m_hFont, nullptr));
 
     // Calculate the AverageWidthFactor, see LogicalFontInstance::GetScale().
@@ -378,7 +378,6 @@ void WinFontInstance::SetHDC(const HDC hDC)
         return;
     ReleaseHbFont();
     m_hDC = hDC;
-    m_hFont = static_cast<HFONT>(GetCurrentObject(m_hDC, OBJ_FONT));
 }
 
 bool WinSalGraphics::CacheGlyphs(const GenericSalLayout& rLayout)