From fd07d1758ee62eebfe95b157ba651de282feec0e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 31 Jan 2014 10:28:55 +0100 Subject: cairo canvas: Zero font's width means "the same as height". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1d24b2039fb3c615e672189d12c77e960cc858ee Reviewed-on: https://gerrit.libreoffice.org/7764 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- canvas/source/cairo/cairo_textlayout.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 35defcd9080b..8924b4f9614c 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -518,7 +518,11 @@ namespace cairocanvas if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0); - cairo_matrix_scale(&m, aFont.GetWidth(), aFont.GetHeight()); + long nWidth = aFont.GetWidth(); + long nHeight = aFont.GetHeight(); + if (nWidth == 0) + nWidth = nHeight; + cairo_matrix_scale(&m, nWidth, nHeight); //faux italics if (rSysFontData.bFakeItalic) -- cgit v1.2.3