summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-17 17:42:09 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-12-17 22:06:56 +0100
commitb9505d6be5ff62930ec68a1baeb7c4bcf01442a4 (patch)
treeef0000f43174785685f919c2ceadb721a63e3951 /cui
parent0a9917b756cf49b117766c9236a7bf63d6d4b607 (diff)
Related: tdf#122120 left align text if preview won't fit
in the number format page Change-Id: Ic398e5302ee54dfd437e07fdf892269e6eefd8fa Reviewed-on: https://gerrit.libreoffice.org/65284 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/numfmt.cxx13
1 files changed, 11 insertions, 2 deletions
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();
}