drawinglayer/source/primitive2d/textlayoutdevice.cxx | 14 -------------- 1 file changed, 14 deletions(-)
New commits: commit d935040e8f586ccb9dcf7fef30d72715a9f0ac98 Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Wed Aug 19 06:05:46 2020 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Wed Aug 19 16:21:27 2020 +0200 tdf#127471 Remove font width scaling hack Which causes distorted fonts in certain cases (see bug report). Fix was suggested by Ilhan Yesil at https://bugs.documentfoundation.org/show_bug.cgi?id=127471#c6 Change-Id: Ie644f56f0835ffad9230f981d2927d6b4c17453d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100970 Tested-by: Tomaž Vajngerl <qui...@gmail.com> Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> (cherry picked from commit 8891a2fc2a4bf86add68691b7ac167a07a8add84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100938 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index e3e57b2b5997..de2f76cb74f6 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -401,20 +401,6 @@ namespace drawinglayer::primitive2d aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE); aRetval.SetLanguage(LanguageTag::convertToLanguageType( rLocale, false)); -#ifdef _WIN32 - // for WIN32 systems, correct the FontWidth if FontScaling is used - if(bFontIsScaled && nHeight > 0) - { - const FontMetric aUnscaledFontMetric(Application::GetDefaultDevice()->GetFontMetric(aRetval)); - - if(aUnscaledFontMetric.GetAverageFontWidth() > 0) - { - const double fScaleFactor(static_cast<double>(nWidth) / static_cast<double>(nHeight)); - const sal_uInt32 nScaledWidth(basegfx::fround(static_cast<double>(aUnscaledFontMetric.GetAverageFontWidth()) * fScaleFactor)); - aRetval.SetAverageFontWidth(nScaledWidth); - } - } -#endif // handle FontRotation (if defined) if(!basegfx::fTools::equalZero(fFontRotation)) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits