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

Julien Nabet serval2412 at yahoo.fr
Fri Apr 25 00:16:05 PDT 2014


 sw/source/core/uibase/utlui/uitool.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1900ac0b853eb3ae55c495da078410709004f433
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Apr 25 09:12:04 2014 +0200

    Related fdo#77874: [None] as only possible choice in lists
    
    There was a slight error in commit 3a2a68a90f96d844c2e2636ecf3236c6f365520a
    Indeed rToFill.InsertEntry was never called
    
    Change-Id: I8189d478feecb9442036d13b68685db38e392ec2

diff --git a/sw/source/core/uibase/utlui/uitool.cxx b/sw/source/core/uibase/utlui/uitool.cxx
index fb7f749..0080d3f 100644
--- a/sw/source/core/uibase/utlui/uitool.cxx
+++ b/sw/source/core/uibase/utlui/uitool.cxx
@@ -668,13 +668,13 @@ sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32
 {
     CollatorWrapper& rCaseColl = ::GetAppCaseCollator();
     const sal_Int32 nCount = rToFill.GetEntryCount();
-    while ( nOffset < nCount )
+    while (nOffset < nCount)
     {
         if( 0 < rCaseColl.compareString( rToFill.GetEntry(nOffset), rEntry ))
-            return rToFill.InsertEntry(rEntry, nOffset);
+            break;
         ++nOffset;
     }
-    return nCount;
+    return rToFill.InsertEntry(rEntry, nOffset);
 }
 
 void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bool bWithDefault)


More information about the Libreoffice-commits mailing list