[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/outdev3.cxx |   45 +++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

New commits:
commit 8cbb5ceaa788f2c3ca4326d85edba02d2d8cf06e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 5 12:57:51 2013 +0100

    Resolves: fdo#65407 fix broken ellipse generation
    
    regression since 0e137027fcf294b33a9c7376b17a6c4e33758c52
    
    Change-Id: I88fbb37ae7f62d6aed37d82fba12ab213866a06c
    (cherry picked from commit 3cd7da2249fbf87fa35e6803013a2d51278f70c2)

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 682065a..d5d019a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6656,48 +6656,29 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice,
     {
         if( (nStyle & TEXT_DRAW_CENTERELLIPSIS) == TEXT_DRAW_CENTERELLIPSIS )
         {
-            sal_Int32 nOrigWidth = _rLayout.GetTextWidth( aStr, 0, aStr.getLength() );
-            if ( nOrigWidth <= nMaxWidth )
-                return aStr;
-            sal_Int32 nEraseStart = aStr.getLength()/2;
-            sal_Int32 nEraseEnd = nEraseStart;
-            sal_Int32 nEraseChars = nEraseEnd - nEraseStart;
-            sal_Int32 nEllipsisWidth = _rLayout.GetTextWidth( "...", 0, 3 );
-            bool bRemoveForward = true;
-            while( nEraseChars < aStr.getLength() &&
-                   nOrigWidth - _rLayout.GetTextWidth( aStr, nEraseStart, nEraseEnd ) > nMaxWidth - nEllipsisWidth)
+            OUStringBuffer aTmpStr( aStr );
+            sal_Int32 nEraseChars = 4;
+            while( nEraseChars < aStr.getLength() && _rLayout.GetTextWidth( aTmpStr.toString(), 0, aTmpStr.getLength() ) > nMaxWidth )
             {
-                if (bRemoveForward)
-                    ++nEraseEnd;
-                else
-                    --nEraseStart;
-                bRemoveForward = !bRemoveForward;
-                nEraseChars = nEraseEnd - nEraseStart +1;
+                aTmpStr = OUStringBuffer(aStr);
+                sal_Int32 i = (aTmpStr.getLength() - nEraseChars)/2;
+                aTmpStr.remove(i, nEraseChars++);
+                aTmpStr.insert(i, "...");
             }
-            OUStringBuffer aTmpStr(aStr);
-            aTmpStr.remove(nEraseStart, nEraseChars);
-            aTmpStr.insert(nEraseStart, "...");
             aStr = aTmpStr.makeStringAndClear();
         }
         else if ( nStyle & TEXT_DRAW_ENDELLIPSIS )
         {
-            OUString aTmpStr = aStr.replaceAt( nIndex, aStr.getLength()-nIndex, "" );
-
+            aStr = aStr.copy(0, nIndex);
             if ( nIndex > 1 )
             {
-                sal_Int32 nTmpStrWidth = _rLayout.GetTextWidth( aTmpStr, 0, aTmpStr.getLength() );
-                if ( nTmpStrWidth <= nMaxWidth )
-                    return aStr;
-
-                sal_Int32 nEllipsisWidth = _rLayout.GetTextWidth( "...", 0, 3 );
-                sal_Int32 nEraseStart = aTmpStr.getLength();
-                while ( nEraseStart > 0 &&
-                        nTmpStrWidth -
-                        (_rLayout.GetTextWidth( aTmpStr, 0, nEraseStart-1 ) > nMaxWidth - nEllipsisWidth) )
+                aStr += "...";
+                while ( !aStr.isEmpty() && (_rLayout.GetTextWidth( aStr, 0, aStr.getLength() ) > nMaxWidth) )
                 {
-                    --nEraseStart;
+                    if ( (nIndex > 1) || (nIndex == aStr.getLength()) )
+                        nIndex--;
+                    aStr = aStr.replaceAt( nIndex, 1, "");
                 }
-                aStr = aTmpStr.replaceAt( nEraseStart, aTmpStr.getLength()-nEraseStart, "...");
             }
 
             if ( aStr.isEmpty() && (nStyle & TEXT_DRAW_CLIP) )