canvas/source/cairo/cairo_textlayout.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit f2293d1c1c30ea0f6d8b1d1af5f12262f796cd81 Author: Jan Holesovsky <[email protected]> Date: Fri Jan 31 10:28:55 2014 +0100 cairo canvas: Zero font's width means "the same as height". Change-Id: I1d24b2039fb3c615e672189d12c77e960cc858ee diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 6075029..9f862c8 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -527,7 +527,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) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
