diff options
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/gdi/salfont.cxx | 31 | ||||
-rw-r--r-- | vcl/win/gdi/winlayout.cxx | 2 |
2 files changed, 4 insertions, 29 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 3f6082a6b92d..f37ae89a00a8 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -65,8 +65,6 @@ using namespace vcl; -const int MAXFONTHEIGHT = 2048; - static FIXED FixedFromDouble( double d ) { const long l = static_cast<long>( d * 65536. ); @@ -846,7 +844,6 @@ void ImplGetLogFontFromFontSelect( HDC hDC, HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const & i_rFont, const PhysicalFontFace * i_pFontFace, - float& o_rFontScale, HFONT& o_rOldFont) { HFONT hNewFont = nullptr; @@ -854,25 +851,6 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const & i_rFont, LOGFONTW aLogFont; ImplGetLogFontFromFontSelect( getHDC(), i_rFont, i_pFontFace, aLogFont ); - // #i47675# limit font requests to MAXFONTHEIGHT - // TODO: share MAXFONTHEIGHT font instance - if( (-aLogFont.lfHeight <= MAXFONTHEIGHT) - && (+aLogFont.lfWidth <= MAXFONTHEIGHT) ) - { - o_rFontScale = 1.0; - } - else if( -aLogFont.lfHeight >= +aLogFont.lfWidth ) - { - o_rFontScale = -aLogFont.lfHeight / float(MAXFONTHEIGHT); - aLogFont.lfHeight = -MAXFONTHEIGHT; - aLogFont.lfWidth = FRound( aLogFont.lfWidth / o_rFontScale ); - } - else // #i95867# also limit font widths - { - o_rFontScale = +aLogFont.lfWidth / float(MAXFONTHEIGHT); - aLogFont.lfWidth = +MAXFONTHEIGHT; - aLogFont.lfHeight = FRound( aLogFont.lfHeight / o_rFontScale ); - } hNewFont = ::CreateFontIndirectW( &aLogFont ); HDC hdcScreen = nullptr; @@ -1579,9 +1557,8 @@ bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, // TODO: much better solution: move SetFont and restoration of old font to caller ScopedFont aOldFont(*this); - float fScale = 1.0; HFONT hOldFont = nullptr; - ImplDoSetFont(aIFSD, pFont, fScale, hOldFont); + ImplDoSetFont(aIFSD, pFont, hOldFont); WinFontFace const * pWinFontData = static_cast<WinFontFace const *>(pFont); @@ -1645,9 +1622,8 @@ const void* WinSalGraphics::GetEmbedFontData(const PhysicalFontFace* pFont, long ScopedFont aOldFont(*this); - float fScale = 0.0; HFONT hOldFont = nullptr; - ImplDoSetFont(aIFSD, pFont, fScale, hOldFont); + ImplDoSetFont(aIFSD, pFont, hOldFont); // get the raw font file data RawFontData aRawFontData( getHDC() ); @@ -1676,9 +1652,8 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, // TODO: much better solution: move SetFont and restoration of old font to caller ScopedFont aOldFont(*this); - float fScale = 0.0; HFONT hOldFont = nullptr; - ImplDoSetFont(aIFSD, pFont, fScale, hOldFont); + ImplDoSetFont(aIFSD, pFont, hOldFont); // get raw font file data const RawFontData xRawFontData( getHDC() ); diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 3438e3b79deb..feda998d5759 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -448,7 +448,7 @@ void WinFontInstance::SetGraphics(WinSalGraphics *pGraphics) if (m_hFont) return; HFONT hOrigFont; - m_hFont = m_pGraphics->ImplDoSetFont(GetFontSelectPattern(), GetFontFace(), m_fScale, hOrigFont); + m_hFont = m_pGraphics->ImplDoSetFont(GetFontSelectPattern(), GetFontFace(), hOrigFont); SelectObject(m_pGraphics->getHDC(), hOrigFont); } |