From b9505d6be5ff62930ec68a1baeb7c4bcf01442a4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 17 Dec 2018 17:42:09 +0000 Subject: Related: tdf#122120 left align text if preview won't fit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in the number format page Change-Id: Ic398e5302ee54dfd437e07fdf892269e6eefd8fa Reviewed-on: https://gerrit.libreoffice.org/65284 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/tabpages/numfmt.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 46b3279b3a18..79430d39afc0 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -168,8 +168,17 @@ void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:: aTmpStr = aTmpStr.replaceAt(mnPos, 0, OUString(mnChar)); } } - Point aPosText = Point((mnPos != -1) ? 0 : nLeadSpace, - (aSzWnd.Height() - GetTextHeight()) / 2); + long nX; + if (mnPos != -1) + nX = 0; + else + { + //tdf#122120 if it won't fit anyway, then left align it + if (nLeadSpace > 0) + nX = nLeadSpace; + nX = 0; + } + Point aPosText = Point(nX, (aSzWnd.Height() - GetTextHeight()) / 2); rRenderContext.DrawText(aPosText, aTmpStr); rRenderContext.Pop(); } -- cgit