diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-04-16 22:25:23 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-04-16 22:28:41 +0200 |
commit | c6ec3e4cee8c7c22380780f2661ac23946cdb050 (patch) | |
tree | f45bd723959b4cfd343dace66a3f9b0a1eeecda9 | |
parent | 6ffecab0cfa0168ae2a98dc961de663855d41648 (diff) |
tdf#86793: vcl: speed up OutputDevice::GetEllipsisString()
The ridiculous algrorithm used for TEXT_DRAW_CENTERELLIPSIS will go faster
if we cut out most of the text at the beginning instead of one at a time.
(regression from 912ecaf565e68d2ca3fb9584712313e712749f75)
Change-Id: I9310dda1847222215bafe372e3efef9d365e1ad9
-rw-r--r-- | vcl/source/outdev/text.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 0bd7914bd125..c9c9be0c90f0 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2022,7 +2022,8 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, if( (nStyle & TEXT_DRAW_CENTERELLIPSIS) == TEXT_DRAW_CENTERELLIPSIS ) { OUStringBuffer aTmpStr( aStr ); - sal_Int32 nEraseChars = 4; + // speed it up by removing all but 1.33x as many as the break pos. + sal_Int32 nEraseChars = std::max(4, aStr.getLength() - (nIndex*4)/3); while( nEraseChars < aStr.getLength() && _rLayout.GetTextWidth( aTmpStr.toString(), 0, aTmpStr.getLength() ) > nMaxWidth ) { aTmpStr = OUStringBuffer(aStr); |