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

[Cédric Bosdonnat]

 sw/source/ui/index/cnttab.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 746fff15ad34616635e09125f6d0656da39a05ad
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu May 12 17:34:12 2011 +0200

    Assign to iterator the return value of insert(), fixes fdo#36957
    
    Note that the code path through the else branch is likely broken, too.
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index f8de59b..ae7dfad 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3187,7 +3187,7 @@ void	SwTokenWindow::InsertAtSelection(
         SwFormToken aTmpToken(TOKEN_TEXT);
         SwTOXEdit* pEdit = new SwTOXEdit(&aCtrlParentWin, this, aTmpToken);
 
-        aControlList.insert(iterInsert, pEdit);
+        iterInsert = aControlList.insert(iterInsert, pEdit);
 
         pEdit->SetText(sRight);
         pEdit->SetSizePixel(aControlSize);