From 1d5fe12805020a2e0196936e70a8f29967f2b522 Mon Sep 17 00:00:00 2001 From: Maxim Iorsh Date: Fri, 7 Oct 2011 19:55:13 +0200 Subject: [PATCH] vcl: Incomplete font substitution when FontConfig matches italic font MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.3.4" This is a multi-part message in MIME format. --------------1.7.3.4 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit Bug URL: https://bugassistant.libreoffice.org/show_bug.cgi?id=41556 This patch fixes the issue by properly initializing ImplFontMetricData from ImplFontSelectData. Code is contributed under the LGPLv3+ / MPL. Signed-off-by: Maxim Iorsh --- vcl/source/gdi/outdev3.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --------------1.7.3.4 Content-Type: text/x-patch; name="0001-vcl-Incomplete-font-substitution-when-FontConfig-mat.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-vcl-Incomplete-font-substitution-when-FontConfig-mat.patch" diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index b0f59cd..4d21f5d 100755 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -3304,6 +3304,7 @@ ImplFontMetricData::ImplFontMetricData( const ImplFontSelectData& rFontSelData ) { // initialize the members provided by the font request mnWidth = rFontSelData.mnWidth; + mnSlant = rFontSelData.GetSlant(); mnOrientation = sal::static_int_cast(rFontSelData.mnOrientation); // intialize the used font name @@ -3328,7 +3329,6 @@ ImplFontMetricData::ImplFontMetricData( const ImplFontSelectData& rFontSelData ) mnDescent = 0; mnIntLeading = 0; mnExtLeading = 0; - mnSlant = 0; mnMinKashida = 0; // reset metrics that are usually derived from the measurements --------------1.7.3.4--