vcl/source/outdev/text.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9262e415c6deabc403df51230929649e0511e62
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Apr 16 22:38:45 2015 +0200
overloading is hard to resolve for poor old c++
Change-Id: I76ae48783942a558c674c5dcb2869540a819bf49
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c9c9be0..eb7104d 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2023,7 +2023,7 @@ OUString OutputDevice::ImplGetEllipsisString( const
OutputDevice& rTargetDevice,
{
OUStringBuffer aTmpStr( aStr );
// 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);
+ sal_Int32 nEraseChars = std::max<sal_Int32>(4, aStr.getLength() -
(nIndex*4)/3);
while( nEraseChars < aStr.getLength() && _rLayout.GetTextWidth(
aTmpStr.toString(), 0, aTmpStr.getLength() ) > nMaxWidth )
{
aTmpStr = OUStringBuffer(aStr);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
