[Libreoffice-commits] core.git: extensions/source

Lionel Elie Mamane lionel at mamane.lu
Sun Jun 23 06:51:27 PDT 2013


 extensions/source/propctrlr/browserline.cxx |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 87c50e75633f31b54bfa1758cc0921ac53c6b418
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Jun 23 15:47:36 2013 +0200

    fdo#66002 correct error introduced by "AppendAscii cleanup"
    
    This reverts
    fix endless loop error: 865b5caf6e2256e06f46a39a86d67f03408718a9
    which was a partial revert of
    AppendAscii cleanup: b7df3446c373a93dc5b77b495a54d873d83a91a7
    
    AND fixes the original error in "AppendAscii cleanup".
    
    Change-Id: Ida29af046b277170388e4945c0cdb4ec6116be98

diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 03756b2..d88fdad 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -274,18 +274,19 @@ namespace pcr
     {
         if( m_pTheParent )
         {
-            String aText = m_aFtTitle.GetText();
-            while( m_pTheParent->GetTextWidth( aText ) < m_nNameWidth )
-                        aText.AppendAscii("...........");
-
-             // for Issue 69452
-             if (Application::GetSettings().GetLayoutRTL())
-             {
-                 sal_Unicode cRTL_mark = 0x200F;
-                 aText.Append(cRTL_mark);
-             }
-
-             m_aFtTitle.SetText(aText);
+            OUStringBuffer aText( m_aFtTitle.GetText() );
+
+            while( m_pTheParent->GetTextWidth( aText.toString() ) < m_nNameWidth )
+                        aText.append("...........");
+
+            // for Issue 69452
+            if (Application::GetSettings().GetLayoutRTL())
+            {
+                sal_Unicode cRTL_mark = 0x200F;
+                aText.append( OUString(cRTL_mark) );
+            }
+
+            m_aFtTitle.SetText( aText.makeStringAndClear() );
         }
     }
 


More information about the Libreoffice-commits mailing list