[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Caolán McNamara]

 sw/source/ui/frmdlg/column.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6090777883be55a0650b19096bc3975def44120e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 7 17:41:32 2014 +0100

    Resolves: fdo#84757 1~ instead of ~1 and 10~ instead of 1~0
    
    regression from 3351ebde48a31173c2fea9f7270224017e1f4412
    Date:   Sat Mar 29 22:22:42 2014 +0100
        OUString: remove temporaries and repeated expressions
    
    but understandable as it was unreadable goo originally
    
    (cherry picked from commit 4289c346de432cc94f05aab78a9464350334b11f)
    
    Change-Id: I3ce161bd2628f3a49b14df886ee8d684b248db1c
    Reviewed-on: https://gerrit.libreoffice.org/11847
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d32551a..ff71b0b 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -914,16 +914,17 @@ void SwColumnPage::UpdateCols()
 
 void SwColumnPage::SetLabels( sal_uInt16 nVis )
 {
+    //insert ~ before the last character, e.g. 1 -> ~1, 10 -> 1~0
     const OUString sLbl( '~' );
 
     const OUString sLbl1(OUString::number( nVis + 1 ));
-    m_pLbl1->SetText(sLbl1 + sLbl);
+    m_pLbl1->SetText(sLbl1.replaceAt(sLbl1.getLength()-1, 0, sLbl));
 
     const OUString sLbl2(OUString::number( nVis + 2 ));
-    m_pLbl2->SetText(sLbl2 + sLbl);
+    m_pLbl2->SetText(sLbl2.replaceAt(sLbl2.getLength()-1, 0, sLbl));
 
     const OUString sLbl3(OUString::number( nVis + 3 ));
-    m_pLbl3->SetText(sLbl3 + sLbl);
+    m_pLbl3->SetText(sLbl3.replaceAt(sLbl3.getLength()-1, 0, sLbl));
 
     const OUString sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
     aEd1.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl1));