Kaydet (Commit) c3c6bf23 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Caolán McNamara

Limit the font preview text length.

When text is selected, the preview text is the first TEXT_WIDTH (80)
characters of the selection rounded up to the next word.

However when no word boundary is found, the preview text is as long
as the selection, which causes the preview to be less than usable
in some extreme cases.

This patch is to limit the preview text length when no word boundary
is found, thereby always resulting in predictable behavior.

Change-Id: I8a21638d601714db956b9b160664dfe1e5e49a4a
Reviewed-on: https://gerrit.libreoffice.org/16855Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6793eaa4
...@@ -712,9 +712,11 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl ...@@ -712,9 +712,11 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
if (pImpl->maText.getLength() > (TEXT_WIDTH - 1)) if (pImpl->maText.getLength() > (TEXT_WIDTH - 1))
{ {
sal_Int32 nSpaceIdx = pImpl->maText.indexOf(" ", TEXT_WIDTH); const sal_Int32 nSpaceIdx = pImpl->maText.indexOf(" ", TEXT_WIDTH);
if (nSpaceIdx != -1) if (nSpaceIdx != -1)
pImpl->maText = pImpl->maText.copy(0, nSpaceIdx); pImpl->maText = pImpl->maText.copy(0, nSpaceIdx);
else
pImpl->maText = pImpl->maText.copy(0, (TEXT_WIDTH - 1));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment